Merge branch 'trim-auto'

Conflicts:
	cli/CMakeLists.txt

diff --combined cli/CMakeLists.txt
index e5ad36d990979e84e921bf9008d8b14d15489353,5df363ab943680dc34a5ee121fa10c40553bc211..5f8e116f5279e385ba1875ed659246bbf2c10d79
--- 1/cli/CMakeLists.txt
--- 2/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@@ -1,14 -1,3 +1,14 @@@
 +# Expose the binary/install directories to source
 +#
 +# TODO: Use the same directory layout, for both build and install directories,
 +# so that binaries can find each other using just relative paths.
 +#
 +add_definitions(
 +    -DAPITRACE_PROGRAMS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/bin"
 +    -DAPITRACE_SCRIPTS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${SCRIPTS_INSTALL_DIR}"
 +    -DAPITRACE_WRAPPERS_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/${WRAPPER_INSTALL_DIR}"
 +)
 +
  add_executable (apitrace
      cli_main.cpp
      cli_diff.cpp
@@@ -22,11 -11,12 +22,12 @@@
      cli_retrace.cpp
      cli_trace.cpp
      cli_trim.cpp
 +    cli_resources.cpp
+     trace_analyzer.cpp
  )
  
  target_link_libraries (apitrace
      common
 -    ${PNG_LIBRARIES}
      ${ZLIB_LIBRARIES}
      ${SNAPPY_LIBRARIES}
      ${GETOPT_LIBRARIES}