diff options
| author | Tim Angus <tim@ngus.net> | 2013-02-16 22:13:47 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-02-16 22:13:47 +0000 |
| commit | 46cb042952da4a184ac84540c81bbf0ee9d8e793 (patch) | |
| tree | 2a70300911e4ff3b4f981f858ef7274b2694bb0d /.gitignore | |
| parent | 3e7f87fa4ad043df179a09b7f48f141586d2a816 (diff) | |
Add merge data to .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2,3 +2,5 @@ build Makefile.local *.swp *tags +misc/patches +misc/last-merged-ioq3-revision.temp |