Merge branch 'master' into google
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 07:20:19 +0000 (09:20 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 30 Aug 2010 07:20:19 +0000 (09:20 +0200)
commit1c0259384962cea0075d1969e81a182b08179fb7
treeda60be4c7f0d73c4ccd7f39f75972924a57064cf
parenta98118bc24bae5677f94784fa784d1b24a262261
parent27177a6d4cd3f2be4dcefbb5d3ff72f35550cf78
Merge branch 'master' into google
trunk/src/base/backbone/backbone.cpp