summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-11 19:45:09 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-11 19:45:09 +0200
commitbecab183db5eabee97b0f473c851d270cd11651a (patch)
treed91c1babaca8e6bc5c21ee2c76845951c349e49c /.gitignore
parentbe147735ef7a251661a87e703e25b6e96947d69f (diff)
parent231ffc619a287ec49921e99488bd9fbc733a3c3a (diff)
Merge branch 'master' into allinone-nb
Conflicts: Makefile (manually resolved)
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 8749894..1cd49d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,10 @@
-/basewiki
/basewiki_l10n
/basewiki_nonedit
/basewiki_nonedit_l10n
/content
/content_dummy
-/directives
/directives_l10n
-/smiley
/smiley_l10n
-/templates
/templates_l10n
/templates_nonedit
/templates_nonedit_l10n