diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
| commit | 24fb0da18f1c44dfa1f76d8cde8efbb958aa7659 (patch) | |
| tree | 76157bb2f88c9383b0824476a9e3a9f9a1bff9fa /xorg-server/.gitignore | |
| parent | 6876c31f186414ce975180af79902314c8cdc82a (diff) | |
| parent | d26ea2f474c48afa7d3c261572da5d85b7b62bd8 (diff) | |
| download | vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.gz vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.bz2 vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/glext.h
xorg-server/.gitignore
xorg-server/glx/glxext.c
Diffstat (limited to 'xorg-server/.gitignore')
| -rwxr-xr-x[-rw-r--r--] | xorg-server/.gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/.gitignore b/xorg-server/.gitignore index 4e5c3a5bd..5ef64a0bd 100644..100755 --- a/xorg-server/.gitignore +++ b/xorg-server/.gitignore @@ -7,4 +7,5 @@ xclock xclock-color
xerrordb
xkbdata
-xwin.rc
\ No newline at end of file +xwin.rc
+test-driver
\ No newline at end of file |