From 8ede1a2ecbb62577afd32996956c5feaf7ddf9b6 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Wed, 5 Oct 2011 13:34:52 -0500
Subject: replacing the old HTML user guide with a Sphinx-managed user guide

---
 .gitignore | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index d740c498f..11fb6d67c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,9 @@ application/cache/*
 
 application/logs/*
 !application/logs/index.html
-!application/logs/.htaccess
\ No newline at end of file
+!application/logs/.htaccess
+
+user_guide_src/build/*
+user_guide_src/cilexer/build/*
+user_guide_src/cilexer/dist/*
+user_guide_src/cilexer/pycilexer.egg-info/*
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 935d42f91a55a409ca02857ef1ef660c921ff1db Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Wed, 19 Sep 2012 16:17:03 +0100
Subject: Ignore composer vendor directory

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 11fb6d67c..a035c2b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ application/logs/*
 user_guide_src/build/*
 user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
-user_guide_src/cilexer/pycilexer.egg-info/*
\ No newline at end of file
+user_guide_src/cilexer/pycilexer.egg-info/*
+/vendor/
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From bc2d3036267d908071ab1b26aea0a6f8e23e9201 Mon Sep 17 00:00:00 2001
From: root <root@new-host-16.(none)>
Date: Tue, 28 Oct 2014 15:43:00 -0700
Subject: [ci skip] Untrack nbproject/

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index a035c2b27..9edcfca6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ user_guide_src/build/*
 user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
 user_guide_src/cilexer/pycilexer.egg-info/*
-/vendor/
\ No newline at end of file
+/vendor/
+/nbproject/
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 080dffadd820312e97e8dcf964e90bf745e256b1 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 3 May 2015 23:50:09 -0500
Subject: Should ignore PHPStorm and Sublime Text project files.

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 9edcfca6d..5982f9bad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,15 @@ user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
 user_guide_src/cilexer/pycilexer.egg-info/*
 /vendor/
-/nbproject/
\ No newline at end of file
+
+# IDE Files
+#-------------------------
+/nbproject/
+.idea/*
+
+## Sublime Text cache files
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+*.sublime-workspace
+*.sublime-project
-- 
cgit v1.2.3-24-g4f1b


From da60e9bc66ec90970fbd2dfd08b0a6e66b9f5f5f Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Sat, 31 Dec 2016 08:46:18 -0800
Subject: Update copyright data to 2017

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 5982f9bad..97f1d3159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ user_guide_src/cilexer/pycilexer.egg-info/*
 *.stTheme.cache
 *.sublime-workspace
 *.sublime-project
+/tests/tests/
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 973dbfc648705b26234d5100c08625af8e1a34d6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 3 Jan 2017 13:54:12 +0200
Subject: [ci skip] Remove /tests/tests/ from .gitignore

It got there by accident
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 97f1d3159..5982f9bad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,3 @@ user_guide_src/cilexer/pycilexer.egg-info/*
 *.stTheme.cache
 *.sublime-workspace
 *.sublime-project
-/tests/tests/
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From f565212c5aa07a8016394a3bc66874be83c73d4d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 19 Jan 2017 15:17:00 +0200
Subject: Fix byte-safety issues & actually test for them

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 5982f9bad..eb45390e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ application/logs/*
 !application/logs/index.html
 !application/logs/.htaccess
 
+composer.lock
+
 user_guide_src/build/*
 user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
-- 
cgit v1.2.3-24-g4f1b