Merge branch 'master' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Jul 2010 13:03:20 +0000 (16:03 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Thu, 29 Jul 2010 13:03:20 +0000 (16:03 +0300)
1  2 
src/engine/engine.cpp
src/engine/engine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h

Simple merge
Simple merge
Simple merge
Simple merge