Jan Kaluza 737dd6a062 Fixed merge conflict		2012-12-10 15:09:57 +01:00
..
src	Fixed merge conflict	2012-12-10 15:09:57 +01:00
CMakeLists.txt	Basic spectrum	2011-03-17 21:54:39 +01:00