Merge branch 'master' of mercury.wipsl.com:/var/git/irw
authorTorste Aikio <zokier@zokier.laptop>
Wed, 19 May 2010 13:45:47 +0000 (16:45 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Wed, 19 May 2010 13:45:47 +0000 (16:45 +0300)
1  2 
src/mainwidget.cpp

Simple merge