Merge branch 'bookmarks'
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 18 Aug 2010 13:16:41 +0000 (15:16 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 18 Aug 2010 13:16:41 +0000 (15:16 +0200)
commitd964634323a6f899798a302781ff2b3f90f74072
treea8165b0dfd0d47fee08482b5fb93ffbeb7ee4847
parent04a206780e8c28968a94c694927cfeeb0d6b9cba
parent804dc5933fabfde5eab820646649ed1ca2e3449b
Merge branch 'bookmarks'

Conflicts:
trunk/src/plugins/xdxf/src/xdxfplugin.cpp