summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 14:22:27 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 14:22:27 +0200
commit53991a00b7a53c10646c5757835cbf66bbcc93da (patch)
tree17648432addcb085ef1e1f6a62b7655cde7b339f /README
parent3cfc45e2c94843a39ccd9ed4e667d30bae4cd41d (diff)
parente595e37450ff6c0971924f3e7b461febe4fd1ebb (diff)
Merge branch 'master' into clean
Conflicts (manually resolved): Makefile
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions