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)
commit705cac29f01f9522660f775bef488f64bc38bc7a
treeac23bb8eef8e5f85e0f3821b24e789b72c4f8f11
parent01e432ccc275b9a58f3f57e25185059e44e45920
parentb7f72f7622fa6eab6241bac270de8e7da168528d
Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irw
src/mainwidget.cpp
src/mainwidget.h