]> git.cworth.org Git - apitrace/commit
Merge branch 'master' into d2d
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Sat, 21 Jan 2012 00:06:19 +0000 (00:06 +0000)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Sat, 21 Jan 2012 00:12:31 +0000 (00:12 +0000)
commit48412ffde3dd4710c96d5e8d9cfdf1789e4d703a
tree97ff645050ddabd1de7aa7e901d650db078ca9d2
parentb63c32878eef6a534079ef1664d9b06eaea04023
parent7a6a32e2271a34d530c6914b0ad2bc95700f2cb2
Merge branch 'master' into d2d

Conflicts:
compat.h
trace.py
12 files changed:
.gitignore
CMakeLists.txt
compat.h
d2d1trace.py
d3d9trace.py
dwritetrace.py
specs/d2d1.py
specs/dwrite.py
specs/scripts/cdecl.py
specs/stdapi.py
specs/winapi.py
trace.py