diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-04-10 07:08:12 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-04-10 07:08:12 +0000 |
| commit | e2acc13a127f6213c74d9657c1e34499ae8f86e9 (patch) | |
| tree | a90a4177ccd7698e4f43bbc2e3bc918576a9d77d /offapi | |
| parent | 5423db2752b74c8aa77ca7ccbedb6d18e45e3d1b (diff) | |
#i10000# conflict resolved
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/prj/build.lst | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/offapi/prj/build.lst b/offapi/prj/build.lst index b9a1a2206343..68f22e395cb0 100644 --- a/offapi/prj/build.lst +++ b/offapi/prj/build.lst @@ -89,8 +89,4 @@ oa offapi\com\sun\star\xml\wrapper nmake - all oa_wrapper oa_sax NULL oa offapi\com\sun\star\geometry nmake - all oa_geometry NULL oa offapi\com\sun\star\rendering nmake - all oa_rendering oa_geometry NULL oa offapi\drafts\com\sun\star\form nmake - all oa_drafts_form NULL -<<<<<<< build.lst -oa offapi\util nmake - all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_finsp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_inspection oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper NULL -======= oa offapi\util nmake - all oa_util oa_auth oa_awt oa_chart oa_chart2 oa_config oa_configbootstrap oa_configbackend oa_configbackend_xml oa_datatrans_clip oa_datatrans_dnd oa_datatransfer oa_docu oa_draw oa_embed oa_fcomp oa_fcontr oa_fieldmaster oa_form oa_xforms oa_formula oa_frame oa_i18n oa_inst oa_ldap oa_ling2 oa_mail oa_media oa_mozilla oa_packages oa_manifest oa_zippackage oa_plug oa_pres oa_animations oa_putil oa_resrc oa_sax oa_xml_input oa_scan oa_sdb oa_sdbc oa_sdbcx oa_setup oa_sheet oa_style oa_svg oa_sync oa_sync2 oa_system oa_table oa_task oa_text oa_textfield oa_docinfo oa_ucb oa_view oa_xml oa_xml_dom oa_xml_xpath oa_xml_views oa_xml_events oa_image oa_xsd oa_ui oa_ui_dialogs oa_accessibility oa_form_binding oa_form_validation oa_form_submission oa_geometry oa_rendering oa_sfprovider oa_sfbrowse oa_drafts_form oa_deployment oa_deployment_ui oa_frame_status oa_gallery oa_graphic oa_security oa_crypto_sax oa_crypto oa_csax oa_wrapper oa_script NULL ->>>>>>> 1.74.36.1 |