still fighting with merge conflict
authorOliver Brunner <aros@oliver-brunner.de>
Fri, 25 Oct 2013 08:26:39 +0000 (10:26 +0200)
committerOliver Brunner <aros@oliver-brunner.de>
Fri, 25 Oct 2013 08:26:39 +0000 (10:26 +0200)
commitf553987b4f23f143bc2314296c502ec32a0a889b
treeef0cfb23cb551228c1e4a2472d7850e7daf0c156
parenta0876cc25ae40b756fb9e105cf54182b3418776d
still fighting with merge conflict
AROS/config/config.h.in