diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:45:39 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:45:39 +0200 |
| commit | 61ccb5d0b29875f61cac2ea39474d16a0437692c (patch) | |
| tree | 1a6764e2b49a788ef6683935883ed6ddf8574c3b /.gitignore | |
| parent | 258ef913fa6cfa38c7d9fe137a296bd03d62da09 (diff) | |
| parent | fa843e5a6436ec8c53f89255205515610107519c (diff) | |
Merge branch '_clean' into clean
Conflicts:
Makefile (manually resolved)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 |