Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
authorTorste Aikio <zokier@zokier.laptop>
Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)
committerTorste Aikio <zokier@zokier.laptop>
Thu, 8 Jul 2010 11:54:49 +0000 (14:54 +0300)
commit667c593e7d27696867fb31d73ea7f3bd92971925
tree2e7e3d5405ef5a07f6917db849ce974f447dcd93
parenteb29b282d9e3a0f3a23827b83ee591f0e194056c
parentb7ed6b2adabca3f775e65ba14893eef74f042560
Merge branch 'master' of mercury.wipsl.com:/var/git/irwi
src/selectremotedlg.cpp
src/settingsdlg.cpp