Merge branch 'cache' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 24 Aug 2010 13:16:10 +0000 (15:16 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 24 Aug 2010 13:16:10 +0000 (15:16 +0200)
commit247785d18014d36e7220b01e13a9225597af3c99
tree4dd40e64daff47d932e3c49ffe937b16dc0ffacf
parent073b726c187df9a2ceb2c99380f794af000d0fa6
parent97f8debedc7520add3ba4212bad4a7a4d999495b
Merge branch 'cache' into google

Conflicts:
trunk/src/base/gui/MenuWidget.cpp
trunk/src/base/gui/MenuWidget.cpp
trunk/src/includes/CommonDictInterface.h
trunk/src/plugins/xdxf/src/xdxfplugin.cpp