ooo-build r10881 - in branches/sled-10-ooo-build-2-3: . patches/src680

[tml svn gnome org]

Author: tml
Date: 2007-11-20 11:42:57 +0000 (Tue, 20 Nov 2007)
New Revision: 10881
ViewCVS link: http://svn.gnome.org/viewcvs/ooo-build?rev=10881&view=rev

Modified:
   branches/sled-10-ooo-build-2-3/ChangeLog
   branches/sled-10-ooo-build-2-3/patches/src680/win32-multi-lang-installer.diff
Log:
2007-11-20  Tor Lillqvist  <tml novell com>

	Merge from trunk:

	* patches/src680/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/download.pm): Don't put all the
	language codes in the NSIS output file name if there are lots of
	them, just use the string "multi" as part of the filename then.

	* patches/src680/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/download.pm): Don't break NSIS by
	including the same language nsh file twice.