diff options
author | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
---|---|---|
committer | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
commit | fd6649175956c9d322fe02fd413fe6970aa6819e (patch) | |
tree | ce2691616f82ef55d3b8f3e45812777477e8668f /postprocess/prj | |
parent | add framework to tail_build (diff) | |
parent | support libebook-1.2.so.12 (evolution 3.2) (diff) | |
download | core-fd6649175956c9d322fe02fd413fe6970aa6819e.tar.gz core-fd6649175956c9d322fe02fd413fe6970aa6819e.zip |
Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions
Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk
Diffstat (limited to 'postprocess/prj')
-rw-r--r-- | postprocess/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 92dff0cdd208..e8fd35ab08c6 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL +po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest 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 |