summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 14:23:14 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 14:23:14 +0200
commit5f926272183679652f94543bd3f02f0acf4e6a25 (patch)
treefcd57d3fe3bae27bd3dedca81918d094939956df /.gitignore
parentc391c098a1b19b0e8709c0d83ec9de2de2f8da7f (diff)
parente595e37450ff6c0971924f3e7b461febe4fd1ebb (diff)
Merge branch 'master' into scs
Conflicts (manually resolved): Makefile
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions