diff options
author | José Fonseca <jose.r.fonseca@gmail.com> | 2011-09-23 08:33:13 +0100 |
---|---|---|
committer | José Fonseca <jose.r.fonseca@gmail.com> | 2011-09-23 08:33:13 +0100 |
commit | ae2b4d32ed56e3ac193cc7205aeb58082c448ce8 (patch) | |
tree | 7225d26bd1400dacb64ed680fd1514611f6cf025 /ddraw.py | |
parent | af7d231ddf7f7fef342782932e85479044de1757 (diff) | |
parent | 892cad6f24175221d2e7bdf3c7fe6c34b64ee50a (diff) |
Merge branch 'master' into d3d10
Conflicts:
CMakeLists.txt
Diffstat (limited to 'ddraw.py')
-rw-r--r-- | ddraw.py | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -26,7 +26,6 @@ """ddraw.h""" from winapi import * -from trace import DllTracer DirectDrawOptSurfaceDescFlags = Flags(DWORD, [ "DDOSD_GUID", |