diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 14:10:47 +0100 |
| commit | 3bc24b271f45f9f33484b8cf53b44f33f7e8a237 (patch) | |
| tree | 193651a94adb3804e800747e993d07b92688e4d4 /filesthatshouldbethesame.py | |
| parent | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (diff) | |
| parent | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (diff) | |
| download | vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.gz vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.tar.bz2 vcxsrv-3bc24b271f45f9f33484b8cf53b44f33f7e8a237.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'filesthatshouldbethesame.py')
| -rwxr-xr-x | filesthatshouldbethesame.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/filesthatshouldbethesame.py b/filesthatshouldbethesame.py index cf299a9b1..9f8b4f7f4 100755 --- a/filesthatshouldbethesame.py +++ b/filesthatshouldbethesame.py @@ -90,6 +90,7 @@ xorg-server/hw/xwin/glx/wglext.h mesalib/include/GL/wglext.h mesalib/src/mapi/glapi/glapi.h xorg-server/glx/glapi.h mesalib/src/mapi/glapi/gen/glapitable.h mesalib/src/mesa/main/glapitable.h +mesalib/src/util/macros.h xorg-server/glx/util/macros.h mesalib/src/mesa/main/glapitable.h xorg-server/glx/glapitable.h mesalib/src/mapi/glapi/gen/glprocs.h xorg-server/glx/glprocs.h mesalib/src/mapi/glapi/gen/dispatch.h xorg-server/glx/dispatch.h |