summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2011-10-06 03:47:59 +0200
committerTimothy Warren <tim@timshomepage.net>2011-10-06 03:47:59 +0200
commitfb7ff742949e0474dfba30be45be513b3b4f63cc (patch)
tree87b150fd502d0789f9660ca4dc2ace44817813c3 /.gitignore
parentf7a8d86dbc6805a4e52964bbea76738df75b5f35 (diff)
parentec8abee24f456b09ab9d53e88853fe6bd0f7879a (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 6 insertions, 1 deletions
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