Merge branch 'trim-auto'

Conflicts:
	cli/CMakeLists.txt

diff --cc cli/CMakeLists.txt
index e5ad36d990979e84e921bf9008d8b14d15489353,5df363ab943680dc34a5ee121fa10c40553bc211..5f8e116f5279e385ba1875ed659246bbf2c10d79
--- 1/cli/CMakeLists.txt
--- 2/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