diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:46:25 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:46:25 +0200 |
| commit | 0a184c16c927ad613935c28322d7eb33b18aedc9 (patch) | |
| tree | 8c5091c9872174f29b123e788fdbf50f62bf2d97 /.gitignore | |
| parent | a4d3a0fc6319df9acf57b8df12f5f0054fd3b074 (diff) | |
| parent | 1c38e0cb52a622d7ebd6ef2f45d95efcb37e878c (diff) | |
Merge branch '_scs' into scs
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 |