diff options
| author | Petr Mladek <pmladek@suse.cz> | 2012-11-05 14:34:27 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-11-05 14:34:27 +0100 |
| commit | ef15a5a4acd3174752484c6aeb570d4d6444b645 (patch) | |
| tree | 3d1d5b58f85737aa46241aea4c4dabea520cecc2 /config_host.mk.in | |
| parent | a1b0ce05e851e9724c046888a01869eddf9e9db2 (diff) | |
| parent | c309ce0227a14330094191c1ef15fa00899defcb (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6
Conflicts:
desktop/source/app/sofficemain.cxx
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 9f38be91d5cc..3997e7f71b2a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -422,6 +422,8 @@ export PRODUCTNAME=@PRODUCTNAME@ export PRODUCTVERSION=@PRODUCTVERSION@ export PROGRESSBARCOLOR=@PROGRESSBARCOLOR@ export PROGRESSFRAMECOLOR=@PROGRESSFRAMECOLOR@ +export PROGRESSTEXTCOLOR=@PROGRESSTEXTCOLOR@ +export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@ export PROGRESSPOSITION=@PROGRESSPOSITION@ export PROGRESSSIZE=@PROGRESSSIZE@ export PROEXT=@PROEXT@ |