Merge branch 'development/ui'
authorToni Jussila <toni.jussila@fudeco.com>
Wed, 31 Mar 2010 08:40:26 +0000 (11:40 +0300)
committerToni Jussila <toni.jussila@fudeco.com>
Wed, 31 Mar 2010 08:40:26 +0000 (11:40 +0300)
1  2 
Client/mainwindow.cpp

Simple merge