Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 17 Sep 2010 06:11:55 +0000 (08:11 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Fri, 17 Sep 2010 06:11:55 +0000 (08:11 +0200)
commit7d134c0f82d884194f773f8bb85ed53b1301fd7b
treefa22acf08ceb18d003245880276dd989da8c8e0d
parente92f330da63bce580e3dffb75f456ba8f49507d0
parent90401aae5b2675e07ad05c8d37061915a9721bb8
Merge branch 'master' into google
src/mdictionary/backbone/backbone.cpp