graffy76 ba365ff49e Fixed merge conflicts with saving branch		2013-10-25 19:23:03 -05:00
..
model	Fixed merge conflicts with saving branch	2013-10-25 19:23:03 -05:00
view	Fixed merge conflicts with saving branch	2013-10-25 19:23:03 -05:00
CMakeLists.txt	merge from saving	2013-10-25 14:44:22 -05:00
editor.cpp	Fixed merge conflicts with saving branch	2013-10-25 19:23:03 -05:00
editor.hpp	Fixed merge conflicts with saving branch	2013-10-25 19:23:03 -05:00
main.cpp	Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path.	2013-10-18 22:11:14 +02:00