- Makefile: resolve merge conflict.
authorSiesh1oo <siesh1oo@siesh1oo.no>
Tue, 11 Mar 2014 18:39:01 +0000 (19:39 +0100)
committerSiesh1oo <siesh1oo@siesh1oo.no>
Thu, 13 Mar 2014 10:29:03 +0000 (11:29 +0100)
commit89443aadbc6a20270de024f41ae1cc79ec75a8cf
treef1027fa49eaeb55d272e243e0eb14dea52c57d6a
parenta4d72de91dc017b299d6c11d67786274f1326133
 - Makefile: resolve merge conflict.
Makefile