From 871fe1257fbf46f3e3259ccceeaaf924ba9d56b1 Mon Sep 17 00:00:00 2001
From: Zex Li <top_zlynch@yahoo.com>
Date: Mon, 25 Jan 2016 16:13:14 +0800
Subject: extend defined(ACE_NLOGGING) range

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index a4b0d7f9a13..34701c298c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ ipch/
 /setenv.cmd
 /setenv.sh
 /build
+
+*.o
-- 
cgit v1.2.1


From ba598d79b5500e8eb529d070f73962a0648ef280 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 29 Mar 2016 11:41:34 +0200
Subject: Ignore res files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 34701c298c1..9a03a35fb85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ ipch/
 /build
 
 *.o
+*.res
-- 
cgit v1.2.1


From e702f9837f810ebcb3e49d6b9a2958bcf963478d Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 29 Mar 2016 11:42:33 +0200
Subject: Ignore opendb files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 9a03a35fb85..2bcf19361ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ ipch/
 
 *.o
 *.res
+*.opendb
-- 
cgit v1.2.1


From 6d202eac82ff7649897134c377ef86d59822bec5 Mon Sep 17 00:00:00 2001
From: Phil Mesnier <mesnier_p@ociweb.com>
Date: Tue, 5 Apr 2016 16:30:42 -0500
Subject: Adding more patterns to ignore

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 2bcf19361ab..4ebaed388b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,19 @@
 *.sdf
 *.sln
 *.suo
+Debug
+*A.cpp
+*A.h
+*A.inl
+*C.cpp
+*C.h
+*C.inl
+*S.cpp
+*S.h
+*S.inl
+*S_T.cpp
+*S_T.h
+*S_T.inl
 
 .depend.*
 GNUmakefile*
-- 
cgit v1.2.1


From 61b67c51c373a2b4f245d1a954e8b6200adc7e4a Mon Sep 17 00:00:00 2001
From: Phil Mesnier <mesnierp@ociweb.com>
Date: Wed, 13 Apr 2016 00:04:40 -0500
Subject: revert conflicting ignores, re-indent, and remove cli delay

---
 .gitignore | 10 ----------
 1 file changed, 10 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 4ebaed388b9..d4a2a896b1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,16 +12,6 @@
 *.sdf
 *.sln
 *.suo
-Debug
-*A.cpp
-*A.h
-*A.inl
-*C.cpp
-*C.h
-*C.inl
-*S.cpp
-*S.h
-*S.inl
 *S_T.cpp
 *S_T.h
 *S_T.inl
-- 
cgit v1.2.1


From 602c0b17174fd84710f8730ad905a9014ec1e84b Mon Sep 17 00:00:00 2001
From: Adam Mitz <mitza@ociweb.com>
Date: Wed, 6 Jul 2016 13:32:00 -0500
Subject: Fix bugzilla #4215: workaround for a compiler bug in vc14-update3

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index d4a2a896b1f..a2aed252e6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ ipch/
 *.o
 *.res
 *.opendb
+*.VC.db
-- 
cgit v1.2.1