diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:25:15 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-06-30 14:25:15 +0000 |
commit | eb6fcd4979304b40890378f7077595e0e81b4072 (patch) | |
tree | 13666781ff0419535d3a1e4816bfdb962206c153 /scp2/util/makefile.mk | |
parent | 96cff5c7e56e2ae6dfd04bad15280e8cab4293d3 (diff) |
INTEGRATION: CWS native160 (1.50.12); FILE MERGED
2008/06/24 10:38:35 is 1.50.12.1: #i88671# merging msvc90 libraries
Diffstat (limited to 'scp2/util/makefile.mk')
-rw-r--r-- | scp2/util/makefile.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 4de8cc28fc2a..a14971082c54 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.51 $ +# $Revision: 1.52 $ # # This file is part of OpenOffice.org. # @@ -117,6 +117,7 @@ SCP1FILES += \ folder_ooo.par \ folderitem_ooo.par \ windowscustomaction_ooo.par \ + mergemodules_ooo.par \ registryitem_writer.par \ folderitem_writer.par \ registryitem_calc.par \ @@ -270,6 +271,7 @@ SCP2FILES += \ folder_ooo.par \ folderitem_ooo.par \ windowscustomaction_ooo.par \ + mergemodules_ooo.par \ registryitem_writer.par \ folderitem_writer.par \ registryitem_calc.par \ |