From: Zack Rusin <zack@kde.org>
Date: Mon, 18 Apr 2011 21:04:01 +0000 (-0400)
Subject: Merge branch 'trace-editing'
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=0ad49cbe3446dfe8404516852c904b40cf909c7c;p=apitrace

Merge branch 'trace-editing'

fixes #1
---

0ad49cbe3446dfe8404516852c904b40cf909c7c
diff --cc CMakeLists.txt
index 1131ae4,0270d97..a157889
mode 100755,100644..100755
--- a/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