Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irw
authorJari Jarvi <t7jaja00@students.oamk.fi>
Wed, 19 May 2010 09:18:27 +0000 (12:18 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Wed, 19 May 2010 09:18:27 +0000 (12:18 +0300)
1  2 
src/mainwidget.cpp
src/mainwidget.h

Simple merge
Simple merge