Merge branch 'trace-editing'

fixes #1

diff --cc CMakeLists.txt
index 1131ae4c61d62601976e10468fd9ffdd531583cb,0270d979184c2d3003f0a05498301665e0f50c66..a157889e3092e81457fb6aabc030c192b8c4a04b
mode 100755,100644..100755
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -210,10 -207,10 +210,10 @@@ else (WIN32
      set (glws glws_glx.cpp)
  endif (WIN32)
  
- add_library (trace trace_model.cpp trace_parser.cpp ${os})
+ add_library (trace trace_model.cpp trace_parser.cpp trace_write.cpp ${os})
  
 -add_executable (dump dump.cpp)
 -target_link_libraries (dump trace)
 +add_executable (tracedump tracedump.cpp)
 +target_link_libraries (tracedump trace)
  
  add_custom_command (
      OUTPUT glretrace_gl.cpp

diff --cc trace_write.cpp
Simple merge