Merge branch 'backbone'
authorBartosz Szatkowski <bulislaw@linux.com>
Fri, 20 Aug 2010 10:07:10 +0000 (12:07 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Fri, 20 Aug 2010 10:07:10 +0000 (12:07 +0200)
commit2f6f180f4d546d73a7493ff05c870f1c29ca7f10
tree2144b900bf2b7b9f6945e4c8e5ffccff1c46a40d
parent5c5f95746d97bc8b4376356d354ed21935cb6bfe
parent81fb773fdb360f8fc3842a32847857793fc8d116
Merge branch 'backbone'

Conflicts:
trunk/src/base/base.pro
trunk/src/base/base.pro