diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:36 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:36 +0200 |
commit | 087b5a107c54045d44fe4f16374d552a6ae237c5 (patch) | |
tree | 6db18f9ca694e641930cd58563cd6c5de49a93e0 /postprocess/prj | |
parent | 6ca81d4283601b2ba636dc7f96a88764cac42606 (diff) | |
parent | 561ac3fea6612c49b83fd4b3a08031727ec0fa40 (diff) |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
postprocess/prj/build.lst
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 48dc474a26c1..f249876bd04e 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL +po postprocess :: accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io librsvg lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native slideshow starmath sw sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\checkdeliver nmake - all po_checkdlv NULL |