Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 14 Sep 2010 11:47:50 +0000 (13:47 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Tue, 14 Sep 2010 11:47:50 +0000 (13:47 +0200)
commit53256ff2a20d994b209f95549c7846bdd1c73c1b
tree24bd4fdb81a746f652f992ef43cd0334505c0877
parentb4240be6f4bb7292ff2efe8c9c83c77401a84c73
parent736cd5e45766c9d323cca7bdcffc8679f73fd123
Merge branch 'master' into google
src/mdictionary/backbone/backbone.cpp