Merge branch 'note_queue'
authorlampehe-local <henri.lampela@ixonos.com>
Tue, 8 Jun 2010 10:59:12 +0000 (13:59 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Tue, 8 Jun 2010 10:59:12 +0000 (13:59 +0300)
commitc9adb68500729acb1b32ed42a49ae280a75955a8
tree6129db88480f25f2ca32381377af59880a298881
parentca1618a70fa8d01bc9d4737fbf9bc4e61a308e00
parentb3606b2869afbc890c7e1d8eb5ba97e0bf762def
Merge branch 'note_queue'
src/engine/engine.cpp
src/ui/mainwindow.cpp
src/ui/mainwindow.h