From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Mon, 5 Nov 2012 23:38:09 +0000 (+0000)
Subject: Merge branch 'master' into dxva
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=1f94577d8c4b1c1a2a1a8f3dceb0daac02dd72b7

Merge branch 'master' into dxva

Conflicts:
	common/trace_parser_flags.cpp
---

1f94577d8c4b1c1a2a1a8f3dceb0daac02dd72b7
diff --cc wrappers/d3d9trace.py
index 17ebe19,df39927..33f6e9d
--- a/wrappers/d3d9trace.py
+++ b/wrappers/d3d9trace.py
@@@ -84,9 -77,8 +85,9 @@@ if __name__ == '__main__'
      print '#include "os.hpp"'
      print
      print '#include "d3d9imports.hpp"'
-     print '#include "d3dsize.hpp"'
+     print '#include "d3d9size.hpp"'
      print '#include "d3d9shader.hpp"'
 +    print '#include "dxvaint.h"'
      print
      print '''
  static inline size_t