projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e72820b 640585b)
Merge branch 'searching' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Tue, 10 Aug 2010 07:37:44 +0000 (09:37 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Tue, 10 Aug 2010 07:37:44 +0000 (09:37 +0200)
1  2 
trunk/src/base/backbone/backbone.cpp patch | diff1 | diff2 | blob | history
trunk/src/base/backbone/backbone.h patch | diff1 | diff2 | blob | history

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