]> git.cworth.org Git - apitrace/commit
Merge branch 'master' into compression
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Wed, 24 Aug 2011 18:58:47 +0000 (19:58 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Wed, 24 Aug 2011 18:58:47 +0000 (19:58 +0100)
commit1035b94bc86d70dc0f6af1adcf7f20fd5d2bdca3
treefa346a4f3425f2c752cc91a92ec8262149ee3c0e
parentf32476d63b395c2d844247bd4d7fae4173df4065
parent734121778439134bf4843a1b22038fb9ece333c1
Merge branch 'master' into compression

Conflicts:
os.hpp
os_posix.cpp
os_win32.cpp
trace_writer.cpp
CMakeLists.txt
trace_file.cpp
trace_local_writer.cpp
trace_writer.cpp
trace_writer.hpp