Merge branch 'master' into timeout
authorlampehe-local <henri.lampela@ixonos.com>
Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)
commit14adefa833a64e276be14595f49b72660b771ddf
treeba041c5edd82c68295b891e4769733f0b0bcb15c
parent8de3c681c237b85bf598fc90418855a81afcfd05
parent8afdf8bff84160383785e0a8743972dfb94ae142
Merge branch 'master' into timeout
src/ui/mainwindow.cpp
src/ui/mainwindow.h