summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 18:00:30 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 18:00:30 +0200
commit16ff6a317c1b0964a9b41d27786ccd31f8be7bd4 (patch)
tree3ec39b2f1eb31ad3988c736ebfd5e05fd36f5dd4 /Makefile
parent0d7b90e5045da8b47280752825730c30241562cb (diff)
parent6d9436483cdd12f7dc71dabf3e4cda97a05b3bc8 (diff)
Merge branch '_da' into allinone-da
Conflicts (use HEAD of submodule allinone-da): basewiki
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions