diff options
-rwxr-xr-x[-rw-r--r--] | solenv/bin/build.pl | 0 | ||||
-rw-r--r-- | solenv/config/sdev300.ini | 6 |
2 files changed, 0 insertions, 6 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index bff6e870f2e9..bff6e870f2e9 100644..100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 2a83d2cda49e..911726498470 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -8,14 +8,8 @@ common BIG_SVX TRUE BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE -<<<<<<< local - BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT -======= BUILD_STAX YES BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT LIBTEXTCAT LIBTEXTCATDATA AFMS - common_build TRUE - COMMON_OUTDIR common ->>>>>>> other CONFIG_PROJECT config_office DIC_ALL TRUE ENABLEUNICODE TRUE |