]> git.notmuchmail.org Git - apitrace/commitdiff
projects / apitrace / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 537c507 5c298db)
Merge commit '5c298db8fe117e0a445af051335aa0da91c3a31b'
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Thu, 12 Jul 2012 12:44:59 +0000 (13:44 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Thu, 12 Jul 2012 12:44:59 +0000 (13:44 +0100)
1  2 
wrappers/CMakeLists.txt patch | diff1 | diff2 | blob | history

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