diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-18 07:44:28 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-18 07:44:28 +0000 |
| commit | a96282a413d3dde5624d91581719214179b6cfe0 (patch) | |
| tree | 8ea3e2c3076ecc8a54452a77a913fc659e0116b6 /solenv/inc/tg_merge.mk | |
| parent | 82416479b8848d6f465d6ff8194a56dacae49ed1 (diff) | |
INTEGRATION: CWS nativefixer1 (1.4.2); FILE MERGED
2004/10/22 12:48:09 is 1.4.2.1: #i34221# solving merge conflicts in header
Diffstat (limited to 'solenv/inc/tg_merge.mk')
| -rw-r--r-- | solenv/inc/tg_merge.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk index 7a1537488860..e8ab4692cb79 100644 --- a/solenv/inc/tg_merge.mk +++ b/solenv/inc/tg_merge.mk @@ -2,9 +2,6 @@ # # $RCSfile: tg_merge.mk,v $ # -# $Revision: 1.4 $ -# -# last change: $Author: obo $ $Date: 2004-10-18 13:56:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses |