Merge branch 'master' into zoom_button_drag
authorKaj Wallin <kaj.wallin@ixonos.com>
Tue, 25 May 2010 12:20:54 +0000 (15:20 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Tue, 25 May 2010 12:20:54 +0000 (15:20 +0300)
commit450c48ceb3fb3d33425cac0e2dfd80db263093c9
tree942eb3f720d82d502d8a48bd854c0630b5a87e00
parente41e9d5ce7bbab0d921764ac5e042e5967c836ab
parentca50e76561c0cb1b2af5db3491054392a61b20d8
Merge branch 'master' into zoom_button_drag

Conflicts:
src/ui/imagebutton.h
src/ui/mainwindow.cpp
src/ui/zoombuttonpanel.cpp
src/ui/zoombuttonpanel.h
src/src.pro
src/ui/mainwindow.cpp
src/ui/zoombuttonpanel.cpp
src/ui/zoombuttonpanel.h