conflicts refactoring
authorpavelpa <pavelpa@localhost>
Tue, 26 Jan 2010 20:12:21 +0000 (20:12 +0000)
committerpavelpa <pavelpa@localhost>
Tue, 26 Jan 2010 20:12:21 +0000 (20:12 +0000)
commit336fa33e20b71c122b3f29d9eb65587ac57c1b4e
tree02ffbe6e9d806f9e7e5ad3c8516500435eb19add
parent3a8dc71cda38278bb6c89bfe6008f299ff00277d
conflicts refactoring
 - has to be finished
src/icons.qrc
src/icons/exclamation-iconOff.png [deleted file]
src/icons/exclamation-iconOn.png [deleted file]
src/icons/exclamation.png [new file with mode: 0644]
src/mvc/delegate.cpp
src/mvc/delegate.h
src/mvc/treeview.cpp