]> git.cworth.org Git - apitrace/commitdiff
projects / apitrace / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b14eab5 ea76273)
Merge remote-tracking branch 'jbenton/master'
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Mon, 6 Aug 2012 15:35:14 +0000 (16:35 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Mon, 6 Aug 2012 15:35:14 +0000 (16:35 +0100)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
Carl's hacks to apitrace (upstream at https://github.com/apitrace/apitrace)