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)
commit126e5c09047629f571df2352558291509c50071f
tree76f1d1afaef1477ba5363ad67dbf2d030519c08f
parent2c516047c73f507085cb63a019734b45e889269e
parentdb83fd0978acc039adf25ec8c91054da78111fd6
Merge branch 'master' into locationlistview
src/engine/engine.cpp
src/engine/engine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h