/source/kk/instsetoo

/source/kk/instsetoo_native/

cfddb61cd35faa5371510939a34ef1abd8ffc51d

(cherry picked from commit bea9a9501814bdbc342a2adfa57019704260a532) Conflicts: extras/source/gallery/gallery_system/sg10.sdg extras/source/gallery/gallery_system/sg10.thm extras/source/gallery/gallery_system/sg12.sdg extras/source/gallery/gallery_system/sg12.sdv extras/source/gallery/gallery_system/sg12.thm extras/source/gallery/gallery_system/sg16.sdv extras/source/gallery/gallery_system/sg17.sdg extras/source/gallery/gallery_system/sg17.thm extras/source/gallery/gallery_system/sg19.sdg extras/source/gallery/gallery_system/sg19.sdv extras/source/gallery/gallery_system/sg19.thm extras/source/gallery/gallery_system/sg2.sdv Change-Id: I4c2e34c470b05ddae5923e782c31d15aa4961e0d

(cherry picked from commit bea9a9501814bdbc342a2adfa57019704260a532)

Conflicts:
	extras/source/gallery/gallery_system/sg10.sdg
	extras/source/gallery/gallery_system/sg10.thm
	extras/source/gallery/gallery_system/sg12.sdg
	extras/source/gallery/gallery_system/sg12.sdv
	extras/source/gallery/gallery_system/sg12.thm
	extras/source/gallery/gallery_system/sg16.sdv
	extras/source/gallery/gallery_system/sg17.sdg
	extras/source/gallery/gallery_system/sg17.thm
	extras/source/gallery/gallery_system/sg19.sdg
	extras/source/gallery/gallery_system/sg19.sdv
	extras/source/gallery/gallery_system/sg19.thm
	extras/source/gallery/gallery_system/sg2.sdv

Change-Id: I4c2e34c470b05ddae5923e782c31d15aa4961e0d

gallery: chmod -x of .png files 2013-05-15T08:11:41+00:00 Andras Timar atimar@suse.com 2013-05-15T08:10:40+00:00 9c82c2734553690b38fa47afb7e026b6e38787c4 Change-Id: Ib7dffdb36d09d458e3c6089d1d0a16cd5ee63afd

Change-Id: Ib7dffdb36d09d458e3c6089d1d0a16cd5ee63afd

Resolves: #i121407# Gallery reorganizations... 2013-05-10T16:04:28+00:00 Armin Le Grand alg@apache.org 2012-12-05T16:17:41+00:00 fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f and additions of new themes (cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c) Conflicts: extras/prj/build.lst extras/source/gallery/bullets/makefile.mk extras/source/gallery/gallery_system/sg2.sdg extras/source/gallery/gallery_system/sg2.sdv extras/source/gallery/gallery_system/sg2.thm extras/util/target.pmk scp2/source/ooo/directory_ooo.scp scp2/source/ooo/file_extra_ooo.scp svx/inc/galtheme.hrc svx/source/gallery2/gallery1.cxx svx/source/gallery2/galobj.cxx svx/source/gallery2/galtheme.src vcl/inc/vcl/alpha.hxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/bitmapex.hxx vcl/source/gdi/alpha.cxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap3.cxx vcl/source/gdi/bitmapex.cxx (cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f) Conflicts: vcl/source/gdi/bitmap3.cxx Change-Id: If4b2397b889f914487f2135679250c175181e1df

and additions of new themes

(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)

Conflicts:
	extras/prj/build.lst
	extras/source/gallery/bullets/makefile.mk
	extras/source/gallery/gallery_system/sg2.sdg
	extras/source/gallery/gallery_system/sg2.sdv
	extras/source/gallery/gallery_system/sg2.thm
	extras/util/target.pmk
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_extra_ooo.scp
	svx/inc/galtheme.hrc
	svx/source/gallery2/gallery1.cxx
	svx/source/gallery2/galobj.cxx
	svx/source/gallery2/galtheme.src
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/alpha.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmap3.cxx
	vcl/source/gdi/bitmapex.cxx

(cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)

Conflicts:
	vcl/source/gdi/bitmap3.cxx

Change-Id: If4b2397b889f914487f2135679250c175181e1df