summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-10-05 22:08:21 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-10-05 22:08:21 +0200
commit4f0c8cb509f1a16e62bc1ddf23d035fcb06e0214 (patch)
treee0514a8f423613cfb31717e71c04ba186df1b0ae /.gitignore
parent044a5221843cc2d88b936f3e658a1df4bc28cfe2 (diff)
parent57ccd441085a4d387a0c7acdd7eec00ff9c1077a (diff)
Merge branch 'develop' of 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