Stanislav Bas 0277a4e8c4 Implement saving of deleted records ... (cherry picked from commit 8e6a7be6f5) Conflicts: apps/opencs/model/doc/savingstages.cpp		2015-12-05 11:18:15 +11:00
..
model	Implement saving of deleted records	2015-12-05 11:18:15 +11:00
view	Merge branch 'cc9cii' into Feature-1278	2015-11-07 12:04:09 +11:00
CMakeLists.txt	Merge branch 'cc9cii' into Feature-1278	2015-11-07 12:04:09 +11:00
editor.cpp	Merge branch 'cc9cii' into Feature-1278	2015-11-07 12:04:09 +11:00
editor.hpp	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
main.cpp	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00