projects / mdictionary / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4257e87 98e5260)
Merge branch 'master' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 13:49:07 +0000 (15:49 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 13:49:07 +0000 (15:49 +0200)
Conflicts:
debian/files

1  2 
trunk/src/base/backbone/backbone.cpp patch | diff1 | diff2 | blob | history

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