]> git.cworth.org Git - apitrace/commit - thirdparty/libpng/png.h
Merge remote-tracking branch 'github/master' into d2d
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 28 Sep 2012 07:40:24 +0000 (08:40 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 28 Sep 2012 07:40:24 +0000 (08:40 +0100)
commite7cb2b98575d5ff3801bd3527a648e0dbfdebdad
treeff11a81a07af67107d614e4cec672306a9f30de4
parent4fdd5632465440b4f584a74bd4c171aa225a16e5
parentc7af8d42532f3447ea7ba5c24781a44bf010681b
Merge remote-tracking branch 'github/master' into d2d

Conflicts:
.gitignore
CMakeLists.txt
cmake/FindDirectX.cmake
cmake/FindDirectX.cmake
dispatch/d2dimports.hpp
specs/d2d1.py
specs/dwrite.py
wrappers/.gitignore
wrappers/CMakeLists.txt
wrappers/d2d1.def
wrappers/d2d1trace.py
wrappers/dwrite.def
wrappers/dwritetrace.py
wrappers/trace.py