summaryrefslogtreecommitdiff
path: root/postprocess/prj/build.lst.orig
diff options
context:
space:
mode:
Diffstat (limited to 'postprocess/prj/build.lst.orig')
-rw-r--r--postprocess/prj/build.lst.orig12
1 files changed, 12 insertions, 0 deletions
diff --git a/postprocess/prj/build.lst.orig b/postprocess/prj/build.lst.orig
new file mode 100644
index 000000000000..3cd4b803484a
--- /dev/null
+++ b/postprocess/prj/build.lst.orig
@@ -0,0 +1,12 @@
+<<<<<<< HEAD
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
+=======
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
+>>>>>>> feature/gbuild_sdext
+po postprocess usr1 - all po_mkout NULL
+po postprocess\checkxml nmake - all po_checkxml NULL
+po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
+po postprocess\packregistry nmake - all po_packregistry NULL
+po postprocess\packcomponents nmake - all po_packcomponents NULL
+po postprocess\rebase nmake - w po_rebase NULL
+po postprocess\signing nmake - w,sign po_signing po_rebase.w NULL