Mercurial > projects > ldc
diff bin/llvmdc.ini @ 436:657d37df25b0
stupid merge ... :/
| author | Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> |
|---|---|
| date | Wed, 30 Jul 2008 10:41:31 +0200 |
| parents | ecf70fe065b9 |
| children | 11a8a45759a8 |
line wrap: on
line diff
--- a/bin/llvmdc.ini Wed Jul 30 10:12:55 2008 +0200 +++ b/bin/llvmdc.ini Wed Jul 30 10:41:31 2008 +0200 @@ -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