Merge branch 'backbone'
authorBartosz Szatkowski <bulislaw@linux.com>
Tue, 3 Aug 2010 11:32:19 +0000 (13:32 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Tue, 3 Aug 2010 11:32:19 +0000 (13:32 +0200)
commit156e821933d5dcf6cbd0db9b0b0739f9467bf7d3
tree7a10b98bf29d61d0c4610a91ae081c931235c06d
parent11abc3ce30172b953a87042fa358ca64ec02f0ff
parent7a3b1141aa919e21d3e323939f138ab8bc33601f
Merge branch 'backbone'

Conflicts:
trunk/src/includes/CommonDictInterface.h
trunk/src/includes/CommonDictInterface.h