]> git.cworth.org Git - apitrace/commit
Merge branch 'backtrace'
authorJosé Fonseca <jfonseca@vmware.com>
Mon, 13 May 2013 15:44:35 +0000 (16:44 +0100)
committerJosé Fonseca <jfonseca@vmware.com>
Mon, 13 May 2013 15:44:35 +0000 (16:44 +0100)
commit1c803f585d1722fa0809c18c023ba8cf29106f88
tree649deb056304a795147cd718b6b7e7310e0c69e8
parentbcdf8d1a99dca882804c255f58dad058e1e48dcd
parent825bb152a877152c8fd77fd5edc75b5c027023f0
Merge branch 'backtrace'

Conflicts:
common/trace_writer_local.cpp
common/trace_writer_local.cpp
common/trace_writer_local.hpp