Resolving some conflicts in the shortcuts.
authorChristoph Lohmann <20h@r-36.net>
Sun, 2 Dec 2012 21:48:41 +0000 (22:48 +0100)
committerChristoph Lohmann <20h@r-36.net>
Sun, 2 Dec 2012 21:48:41 +0000 (22:48 +0100)
commit760f8f36debebd5a6fd16100e9876df3b9994647
tree73192781230ce6fa6dbe72b6405d9a76c4b4a450
parente96f191088efd2f687aeaa1903bd9b3c8133e1af
Resolving some conflicts in the shortcuts.
config.def.h
surf.1