diff options
author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /swext/mediawiki | |
parent | Add some check to renewpo (diff) | |
parent | oox: ZipStorage: better exception tracing (diff) | |
download | core-06ec1c089519ef3249464aa09eadf03a8db93a39.tar.gz core-06ec1c089519ef3249464aa09eadf03a8db93a39.zip |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'swext/mediawiki')
-rw-r--r-- | swext/mediawiki/src/META-INF/manifest.xml (renamed from swext/mediawiki/src/manifest.xml) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/swext/mediawiki/src/manifest.xml b/swext/mediawiki/src/META-INF/manifest.xml index ab4d1054c32f..ab4d1054c32f 100644 --- a/swext/mediawiki/src/manifest.xml +++ b/swext/mediawiki/src/META-INF/manifest.xml |