Merge branch 'master' into save_message
authorVille Tiensuu <ville.tiensuu@ixonos.com>
Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)
committerVille Tiensuu <ville.tiensuu@ixonos.com>
Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)
commit538cf11926b2555922fb2b940582ab473d7f5286
tree0e9a5095db393e1b8df9bfa889ab6f3939ca7d11
parentf91948497f7d491011268a5d6276596f8eed4d25
parent14adefa833a64e276be14595f49b72660b771ddf
Merge branch 'master' into save_message
src/engine/engine.cpp
src/engine/engine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h