comparison 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
comparison
equal deleted inserted replaced
435:74101be2a553 436:657d37df25b0
1 [Environment] 1 [Environment]
2 <<<<<<< local
3 <<<<<<< local
4
5 DFLAGS=-I%@P%/../tango-llvmdc -L-L%@P%/../lib -R%@P%/../lib
6 =======
7 =======
8 >>>>>>> other
2 DFLAGS=-I%@P%/../tango -R%@P%/../lib 9 DFLAGS=-I%@P%/../tango -R%@P%/../lib
10 <<<<<<< local
11 >>>>>>> other
12 =======
13 >>>>>>> other