ooo-build r13291 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Jul 18 11:08:19 2008
New Revision: 13291
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13291&view=rev

Log:
2008-07-18  Tor Lillqvist  <tml novell com>

	* patches/dev300/novell-win32-installer-branding.diff: Update
	for dev300-m25.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/novell-win32-installer-branding.diff

Modified: trunk/patches/dev300/novell-win32-installer-branding.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-installer-branding.diff	(original)
+++ trunk/patches/dev300/novell-win32-installer-branding.diff	Fri Jul 18 11:08:19 2008
@@ -14,12 +14,12 @@
 @@ -372,10 +372,17 @@
  	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
  	$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
- 	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+ #	$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 -	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
--	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+-#	$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
 +	$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
 +	$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
 +	$(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp