[Scummvm-cvs-logs] scummvm master -> 51f51a968bedd35528a7756dfcdbb6875ddf2963

[Kirben]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bb4915abbe NEWS: Clarify InstallShield bug fix.
51f51a968b BUILD: Update win32dist target, to convert line endings in English QuickStart file too.


Commit: bb4915abbe6ed00a59bceb4c98070830b90a91e2
    https://github.com/scummvm/scummvm/commit/bb4915abbe6ed00a59bceb4c98070830b90a91e2
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-11-17T03:43:19-08:00

Commit Message:
NEWS: Clarify InstallShield bug fix.

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index cc9f9c1..d42f0d6 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,8 @@ For a more comprehensive changelog of the latest experimental code, see:
 
 1.4.1 (????-??-??)
  AGOS:
-   - Fixed loading data directly from InstallShield cabinets in The Feeble
-     Files and Simon the Sorcerer's Puzzle Pack.
+   - Fixed loading videos directly from InstallShield cabinets in the Windows
+     version of the The Feeble Files.
 
  KYRA:
    - Fixed bug in the original Lands of Lore GUI which made ScummVM error out


Commit: 51f51a968bedd35528a7756dfcdbb6875ddf2963
    https://github.com/scummvm/scummvm/commit/51f51a968bedd35528a7756dfcdbb6875ddf2963
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-11-17T03:46:02-08:00

Commit Message:
BUILD: Update win32dist target, to convert line endings in English QuickStart file too.

Changed paths:
    ports.mk



diff --git a/ports.mk b/ports.mk
index c5eb23c..4010ee3 100644
--- a/ports.mk
+++ b/ports.mk
@@ -228,6 +228,7 @@ endif
 	cp $(srcdir)/dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH)
 	unix2dos $(WIN32PATH)/*.txt
+	unix2dos $(WIN32PATH)/doc/*.txt
 	unix2dos $(WIN32PATH)/doc/cz/*.txt
 	unix2dos $(WIN32PATH)/doc/de/*.txt
 	unix2dos $(WIN32PATH)/doc/es/*.txt