Merge branch 'master' into backbone
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 10:13:58 +0000 (12:13 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 10 Aug 2010 10:13:58 +0000 (12:13 +0200)
commit53299326284526b873cfc8285695baf7f8ba7420
tree6d535f8f66544a85b2f12b221da19b235fc35587
parentc09c32805a9199da14ac222e2299604174114f77
parentad6ab232922abea2ecb8cd7896e5288abdace84c
Merge branch 'master' into backbone

Conflicts:
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/SearchBarWidget.cpp
trunk/src/base/gui/SearchBarWidget.h
trunk/src/base/gui/TranslationWidget.cpp
trunk/src/base/gui/TranslationWidget.h