Merge branch 'shipimages'
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 14 Jun 2011 01:41:07 +0000 (04:41 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 14 Jun 2011 01:41:07 +0000 (04:41 +0300)
commiteaca38c4f4d5f6868b428d665ffd52f1bb98ebfe
tree97ac831a1987636af87eb8ac13df35f7d835079b
parentfde07217aedbbbbc3c16f46ec0beab479c8f0616
parente98ce8f6d120d4f89d475c71cbfb2701d8df3a9e
Merge branch 'shipimages'
mainwindow.cpp