summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-04 02:23:22 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-04 02:23:22 +0200
commit3217b2912508eb5e98cca793a1cbc308d6804e59 (patch)
treed454f40ec4d70a7e08432c5f6aae25f6f2760ff6 /Makefile
parent765c48c9ccfa2de4df35c1bbbca46f8aededa498 (diff)
parent5d8259826f728e536b250fe6e1aca8e79967ec71 (diff)
parentb373cc289c777a10b1411441f2c999b2f9fbc9d0 (diff)
Merge branches 'clean' and 'scs' into allinone
Conflicts (merged manually): Makefile