stupid merge ... :/

This commit is contained in:
Tomas Lindquist Olsen
2008-07-30 10:41:31 +02:00
5 changed files with 67 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
[Environment]
DFLAGS=-I%@P%/../tango -L-L%@P%/../lib -R%@P%/../lib
DFLAGS=-I%@P%/../tango-llvmdc -I%@P%/../tango-llvmdc/lib/common -L-L%@P%/../lib -R%@P%/../lib

View File

@@ -1,2 +1,13 @@
[Environment]
<<<<<<< local
<<<<<<< local
DFLAGS=-I%@P%/../tango-llvmdc -L-L%@P%/../lib -R%@P%/../lib
=======
=======
>>>>>>> other
DFLAGS=-I%@P%/../tango -R%@P%/../lib
<<<<<<< local
>>>>>>> other
=======
>>>>>>> other