From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Tue, 11 Dec 2012 07:20:26 +0000 (+0000)
Subject: Merge branch 'trim-auto'
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=9db16b3989481f8d6dfc8932d760fcc16217ecbd

Merge branch 'trim-auto'

Conflicts:
	cli/CMakeLists.txt
---

9db16b3989481f8d6dfc8932d760fcc16217ecbd
diff --cc cli/CMakeLists.txt
index e5ad36d,5df363a..5f8e116
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@@ -22,7 -11,7 +22,8 @@@ add_executable (apitrac
      cli_retrace.cpp
      cli_trace.cpp
      cli_trim.cpp
 +    cli_resources.cpp
+     trace_analyzer.cpp
  )
  
  target_link_libraries (apitrace