]> git.cworth.org Git - apitrace/commitdiff
projects / apitrace / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebf971e b96ab8e)
Merge remote-tracking branch 'origin/master' into on-demand-loading
authorZack Rusin <zack@kde.org>
Tue, 6 Sep 2011 21:45:34 +0000 (17:45 -0400)
committerZack Rusin <zack@kde.org>
Tue, 6 Sep 2011 21:45:34 +0000 (17:45 -0400)

Trivial merge
Carl's hacks to apitrace (upstream at https://github.com/apitrace/apitrace)