projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 073b726 97f8deb)
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)
Conflicts:
trunk/src/base/gui/MenuWidget.cpp

1  2 
trunk/src/base/gui/MenuWidget.cpp patch | diff1 | diff2 | blob | history
trunk/src/includes/CommonDictInterface.h patch | diff1 | diff2 | blob | history
trunk/src/plugins/xdxf/src/xdxfplugin.cpp patch | diff1 | diff2 | blob | history

diff --cc trunk/src/base/gui/MenuWidget.cpp
Simple merge
Unnamed repository; edit this file to name it for gitweb.