Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irw
authorJari Jarvi <t7jaja00@students.oamk.fi>
Wed, 19 May 2010 13:16:42 +0000 (16:16 +0300)
committerJari Jarvi <t7jaja00@students.oamk.fi>
Wed, 19 May 2010 13:16:42 +0000 (16:16 +0300)
commitcf97b5efeb1ae5f60fdcabd6967488449a662b1e
tree03cb6fe7f49ff557737e1f24de58fbab7f578c20
parent2296397643b3c16f2775943e1d710245fa408f5d
parentfa4302850846c26b8e1ce98ab98d55f90d266181
Merge branch 'master' of ssh://mercury.wipsl.com/var/git/irw
src/mainwidget.cpp