summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristoph Lohmann <20h@r-36.net>2012-12-02 22:48:41 +0100
committerChristoph Lohmann <20h@r-36.net>2012-12-02 22:48:41 +0100
commit760f8f36debebd5a6fd16100e9876df3b9994647 (patch)
tree73192781230ce6fa6dbe72b6405d9a76c4b4a450 /Makefile
parente96f191088efd2f687aeaa1903bd9b3c8133e1af (diff)
downloadsurf-760f8f36debebd5a6fd16100e9876df3b9994647.tar.gz
surf-760f8f36debebd5a6fd16100e9876df3b9994647.tar.bz2
surf-760f8f36debebd5a6fd16100e9876df3b9994647.zip
Resolving some conflicts in the shortcuts.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions