Merge branch 'master' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 08:14:24 +0000 (10:14 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 08:14:24 +0000 (10:14 +0200)
commita91a79c7249f4d3b6907d6ab263a6fcd646bd2f7
tree23e6351906a2bb85dad5c5679fc32d13c35ac375
parentabfa7b0b7b6971756e1d8d7bd00005e2fe034b08
parent94334d57be930c368ac17de89eceee32c94f9bcb
Merge branch 'master' into backbone
trunk/src/base/backbone/backbone.cpp