From 46cb042952da4a184ac84540c81bbf0ee9d8e793 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 16 Feb 2013 22:13:47 +0000
Subject: Add merge data to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index bfd2d925..83e0b02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ build
 Makefile.local
 *.swp
 *tags
+misc/patches
+misc/last-merged-ioq3-revision.temp
-- 
cgit