From 9f4c5a6ed4e490fb51aa207c2def75fcb2622584 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Fri, 10 Sep 2010 01:53:57 +0000
Subject: Post-merge fixes: Created project for OPL library. Fixed OPL library
 to not use GNU C-isms such as inline keyword, declaration/statement mixing,
 and strange calling convention syntax for import function pointers. Fixed
 critical buffer overflow in M_BindChatControls - should be back-merged
 immediately. Added autogenerated directories *back* to ignore list.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2052
---
 .gitignore | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 34652d0c..57ab998c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,24 @@
-Makefile.in
-Makefile
-INSTALL
 CMDLINE
-autotools
+INSTALL
+Makefile
+Makefile.in
+TAGS
 aclocal.m4
-configure
+autom4te.cache
+autotools
+bin
+config.h
 config.hin
 config.log
 config.status
-config.h
-autom4te.cache
+configure
+lib
+obj
 rpm.spec
 stamp-h
 stamp-h.in
 stamp-h1
 tags
-TAGS
 
 # These are the default patterns globally ignored by Subversion:
 *.o
-- 
cgit v1.2.3