http://www.mail-archive.com/design@libreoffice.org/msg01165.html

* commit 'ooo/DEV300_m101':
  impressdefaults1: #i113015# #i113017# new defaults for shape filling, outline and shadows
  impress202: #i35600# fixed some shape outlines (flower shape)
  impress202: #i35600# fixed heart + puzzle shape..

Conflicts:
	extras/source/palettes/standard.soc

Signed-off-by: Petr Mladek <pmladek@suse.cz>

gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing

This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.

If you want to build something cool, unstable, and risky, use master.

This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.

If you want to build something cool, unstable, and risky, use master.

Remove LibreOffice colors from standard.soc
Update LibreOffice.soc file
Signed-off-by: Petr Mladek <pmladek@suse.cz>

+dpkg
+rpm
+gcc
+gcj
+gij
+GPS
+spamassassin
+Xen
+uname
+Ogg
+Vorbis
+FLAC

This reverts commit 6e280b46.

* Technological company names
* Services
* Special words

One of the user dictionaries is named "oracle"
https://bugs.freedesktop.org/show_bug.cgi?id=31798

Please remove the Oracle wordbook from the product. First, we don't care about
Oracle reserved words. Second it prevents some local to get some words
corrected like Éducation in French.

Following the colors described at:
http://wiki.documentfoundation.org/Marketing/Branding#Colors

 Introduces:
 --enable-extra-gallery  - for additional galleries
 --enable-extra-template - for additional templates
 --enable-extra-sample   - for additional samples
 --enable-extra-font     - for additional fonts
 configure options.