diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-20 07:08:43 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-06 10:27:24 +0100 |
| commit | 2db25c270e9d6bb052f6eef8864f8fdb1b9b3aee (patch) | |
| tree | 2eaeb8aef38e0f99b1176d20e42d9ab312781df0 /postprocess | |
| parent | 52903da697c4415be7c11aec39c00f196bd22f04 (diff) | |
add sdext to tail_build
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
| -rw-r--r-- | postprocess/prj/build.lst.orig | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 88f604bfadc0..745c25162066 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -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 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 tail_build NULL 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 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 |