conflicts updated correctly
authorpavelpa <pavelpa@localhost>
Thu, 28 Jan 2010 11:25:26 +0000 (11:25 +0000)
committerpavelpa <pavelpa@localhost>
Thu, 28 Jan 2010 11:25:26 +0000 (11:25 +0000)
commit438699c9c023a61e208699e4fdfcb02885766269
tree58f984a5902cfc8eebdf157ac66f294c936f77ac
parentf5d27c7b0607b60babc4405b21f20507ed7fda31
conflicts updated correctly
 - TODO: needs to do some drawing optimizations
src/mvc/treeview.cpp