diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:35:21 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:35:21 +0200 |
| commit | 542a0e91f425b05bc4fb402777f0068c2a8159f4 (patch) | |
| tree | 778fad1d2f39e3b54584d2643cddf0fdc78a9d86 /swext/prj | |
| parent | 9cdba569d3b93b8b6ca6f655816236db503784a9 (diff) | |
| parent | 1bf218731b864f73403a2cf653d8fd231f6e392f (diff) | |
Merge commit 'ooo/OOO330_m9'
Conflicts:
swext/mediawiki/build.xml
swext/prj/build.lst
Diffstat (limited to 'swext/prj')
| -rw-r--r-- | swext/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/swext/prj/build.lst b/swext/prj/build.lst index aa56c04f3448..2e96591abb03 100644 --- a/swext/prj/build.lst +++ b/swext/prj/build.lst @@ -1,4 +1,4 @@ -swext swext : officecfg l10n l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml NULL +swext swext : officecfg l10n l10ntools javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons readlicense_oo xsltml xmlhelp NULL swext swext usr1 - all swext_mkout NULL swext swext\mediawiki\help nmake - all swext_mwhelp NULL swext swext\mediawiki\src\registry\schema\org\openoffice\Office\Custom nmake - all swext_mwschema NULL |