Merge branch 'bookmarks' into gui
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 17 Aug 2010 07:22:48 +0000 (09:22 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Tue, 17 Aug 2010 07:22:48 +0000 (09:22 +0200)
commit34c22f8fc9f3383de681719ac3add65459c9c6cf
treeb909b338f5990d66b6209f33c2d1e6046091e9c4
parentca78a6fc414fb3f5826a99addf75ddb296c89bc0
parentbe80cf171bb7996268c3e30e63f21b5e94a3d6a5
Merge branch 'bookmarks' into gui

Conflicts:
trunk/src/base/base.pro
trunk/src/base/gui/WordListItem.cpp
trunk/src/base/gui/WordListProxyStyle.h
trunk/src/base/gui/WordListWidget.cpp
trunk/src/base/gui/WordListWidget.h
trunk/src/base/base.pro
trunk/src/base/gui/MainWindow.cpp
trunk/src/base/gui/WordListWidget.cpp
trunk/src/base/gui/WordListWidget.h