Merge branch 'master' into locationlistview
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)
commitb8ffbcfb1b3e401005c98e401c9db0114eaab4dc
tree82e6e7b483e78121ab713e23a07f58ea13c76c22
parent126e5c09047629f571df2352558291509c50071f
parenteaba012c9f89624a08d1cf0e772442b6f884f904
Merge branch 'master' into locationlistview
src/engine/engine.cpp
src/engine/engine.h
src/src.pro
src/ui/mainwindow.cpp
src/ui/mainwindow.h