summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2008-05-10 11:09:02 +0200
committerTobias Klauser <tklauser@xenon.tklauser.home>2008-05-10 11:09:02 +0200
commit164d300c2d4d88f2bd787a0c56dc34b3ebb47073 (patch)
tree9e53fd68bd6965b5bc862798543efdbb7fcc3116 /Makefile
parent63993df448640d59812131bb4db664b2ce3b285a (diff)
Resolve some merge conflicts.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions