equal
deleted
inserted
replaced
1 <<<<<<< .working |
|
2 # $Header$ |
|
3 ======= |
|
4 # $Header: /cvs/stx/stx/libtool/bc.mak,v 1.117 2012/03/02 14:30:33 cg Exp $ |
1 # $Header: /cvs/stx/stx/libtool/bc.mak,v 1.117 2012/03/02 14:30:33 cg Exp $ |
5 >>>>>>> .merge-right.r7949 |
|
6 # |
2 # |
7 # DO NOT EDIT |
3 # DO NOT EDIT |
8 <<<<<<< .working |
|
9 # automagically generated from the projectDefinition: stx_libtool at 2012-03-20 16:57:25.229. |
|
10 ======= |
|
11 # automagically generated from the projectDefinition: stx_libtool at 2012-03-02 15:29:27.625. |
4 # automagically generated from the projectDefinition: stx_libtool at 2012-03-02 15:29:27.625. |
12 >>>>>>> .merge-right.r7949 |
|
13 # |
5 # |
14 # Warning: once you modify this file, do not rerun |
6 # Warning: once you modify this file, do not rerun |
15 # stmkmp or projectDefinition-build again - otherwise, your changes are lost. |
7 # stmkmp or projectDefinition-build again - otherwise, your changes are lost. |
16 # |
8 # |
17 # Notice, that the name bc.mak is historical (from times, when only borland c was supported). |
9 # Notice, that the name bc.mak is historical (from times, when only borland c was supported). |