[Scummvm-cvs-logs] scummvm master -> 17edab101b2a2561e92c71c9538aff7c2e7bd343

[anotherguest]

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:
c2debe028d SYMBIAN: Added esock.lib for byteswap.
17edab101b Merge branch 'master' of github.com:scummvm/scummvm


Commit: c2debe028de42db324289deefbe23697c95bbae4
    https://github.com/scummvm/scummvm/commit/c2debe028de42db324289deefbe23697c95bbae4
Author: anotherguest (larspson at gmail.com)
Date: 2014-06-12T10:01:05+02:00

Commit Message:
SYMBIAN: Added esock.lib for byteswap.

Changed paths:
    backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in



diff --git a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
index ddb21b0..899d10d 100644
--- a/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
+++ b/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
@@ -149,7 +149,7 @@ source engines\obsolete.cpp
 LIBRARY cone.lib  eikcore.lib
 LIBRARY euser.lib apparc.lib fbscli.lib
 LIBRARY estlib.lib apgrfx.lib
-LIBRARY gdi.lib hal.lib bitgdi.lib
+LIBRARY gdi.lib hal.lib bitgdi.lib esock.lib
 LIBRARY mediaclientaudiostream.lib efsrv.lib ws32.lib
 library avkon.lib bafl.lib  remconcoreapi.lib remconinterfacebase.lib
 


Commit: 17edab101b2a2561e92c71c9538aff7c2e7bd343
    https://github.com/scummvm/scummvm/commit/17edab101b2a2561e92c71c9538aff7c2e7bd343
Author: anotherguest (larspson at gmail.com)
Date: 2014-06-12T10:01:26+02:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
    engines/fullpipe/gameloader.cpp
    engines/fullpipe/stateloader.cpp