Merge branch 'libreoffice-3-4' of ssh://git.freedesktop.org/git/libreoffice/bootstrap into libreoffice-3-4

This commit is contained in:
Kalman Szalai - KAMI 2011-04-23 03:39:19 +02:00
commit daccfdaedd

View file

@ -274,7 +274,7 @@ AC_ARG_ENABLE(broffice,
AS_HELP_STRING([--disable-broffice],
[When disabled, broffice specific branding artwork for use in the pt_BR
locale is removed, giving uniform branding.]),
,enable_broffice=yes)
,enable_broffice=no)
AC_ARG_ENABLE(cairo,
AS_HELP_STRING([--disable-cairo],