diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
| commit | 2cb91952f6e94907b3614535edbfc3f979085694 (patch) | |
| tree | 6d11e620b1c10564f344d469a5d730e1df7fbb90 /mesalib/src/mesa/.gitignore | |
| parent | 7ec34a94883810e9f4a8e417f00300c2c31808b0 (diff) | |
| parent | e1a407256a5c1571d8f4871fd981a51cfbd46e37 (diff) | |
| download | vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.gz vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.bz2 vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/.gitignore
Diffstat (limited to 'mesalib/src/mesa/.gitignore')
| -rw-r--r-- | mesalib/src/mesa/.gitignore | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mesalib/src/mesa/.gitignore b/mesalib/src/mesa/.gitignore index ce83eaf47..5fc607b9e 100644 --- a/mesalib/src/mesa/.gitignore +++ b/mesalib/src/mesa/.gitignore @@ -1,5 +1 @@ -*/gen_matypes -*/matypes.h -depend.es* -depend.es* -objs-es* +/Makefile |