Change 20091117-maxcarlson-a by maxcarl...@bank on 2009-11-17 13:06:33 PST
in /Users/maxcarlson/openlaszlo/pagan-deities
for http://svn.openlaszlo.org/openlaszlo/branches/pagan-deities
Summary: Backport r9362 from trunk
Bugs Fixed: LPP-6991 - Unable to load image from a URL that does not have the
.jpg extension
Technical Reviewer: hminsky
QA Reviewer: ptw
Details: ran $ svnmerge.py merge -S ../trunk/ -r 9362 .
property 'svnmerge-integrated' set on '.'
property 'svnmerge-blocked' set on '.'
--- Merging r9362 into '.':
U WEB-INF/lps/lfc/kernel/swf/LzMediaLoader.lzs
U WEB-INF/lps/lfc/kernel/swf/LzMakeLoadSprite.as
U WEB-INF/lps/lfc/kernel/swf/LzSprite.as
Skipped 'WEB-INF/lps/lfc/kernel/swf9/LzSprite.as'
C WEB-INF/lps/lfc/views/LaszloView.lzs
Summary of conflicts:
Text conflicts: 1
Skipped paths: 1
property 'svnmerge-integrated' set on '.'
property 'svnmerge-blocked' set on '.'
Reverted swf9/LzSprite.as change, hand-merged change to swf9/LzSprite.lzs.
Merged LaszloView.lzs.
Tests: See LPP-5585
Files:
M .
M WEB-INF/lps/lfc/kernel/swf/LzMediaLoader.lzs
M WEB-INF/lps/lfc/kernel/swf/LzMakeLoadSprite.as
M WEB-INF/lps/lfc/kernel/swf/LzSprite.as
M WEB-INF/lps/lfc/kernel/swf9/LzSprite.lzs
M WEB-INF/lps/lfc/views/LaszloView.lzs
Changeset:
http://svn.openlaszlo.org/openlaszlo/patches/20091117-maxcarlson-a.tar
_______________________________________________
Laszlo-reviews mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-reviews
