[Warzone2100-commits] SF.net SVN: warzone2100:[11118] branches/newnet

[<cy...@us...>]

Revision: 11118
          http://warzone2100.svn.sourceforge.net/warzone2100/?rev=11118&view=rev
Author:   cypr
Date:     2010-07-10 15:11:28 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Merge remote branch 'origin/master' into newnet

Conflicts:
	lib/netplay/netlog.c
	lib/netplay/netlog.h
	lib/netplay/netplay.c
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	macosx/configs/Warzone-Debug.xcconfig
	src/multijoin.c

From: Cyp <cy...@ex...>

Modified Paths:
--------------
    branches/newnet/lib/exceptionhandler/exceptionhandler.c
    branches/newnet/lib/framework/debug.h
    branches/newnet/lib/iniparser/dictionary.c
    branches/newnet/lib/iniparser/dictionary.h
    branches/newnet/lib/ivis_common/Makefile.am
    branches/newnet/lib/ivis_common/ivis_common.vcproj
    branches/newnet/lib/ivis_common/makefile.win32
    branches/newnet/lib/ivis_common/pieblitfunc.h
    branches/newnet/lib/ivis_common/png_util.c
    branches/newnet/lib/ivis_common/png_util.h
    branches/newnet/lib/ivis_opengl/pieblitfunc.c
    branches/newnet/lib/ivis_opengl/screen.c
    branches/newnet/lib/netplay/netlog.c
    branches/newnet/lib/netplay/netplay.c
    branches/newnet/lib/sound/oggvorbis.c
    branches/newnet/lib/sound/openal_track.c
    branches/newnet/macosx/configs/Warzone-Release.xcconfig
    branches/newnet/po/POTFILES.in
    branches/newnet/src/Makefile.am
    branches/newnet/src/action.c
    branches/newnet/src/astar.h
    branches/newnet/src/combat.c
    branches/newnet/src/configuration.h
    branches/newnet/src/design.c
    branches/newnet/src/display3d.c
    branches/newnet/src/droid.c
    branches/newnet/src/frontend.c
    branches/newnet/src/frontend.h
    branches/newnet/src/game.c
    branches/newnet/src/hci.c
    branches/newnet/src/levels.c
    branches/newnet/src/makefile.win32
    branches/newnet/src/move.c
    branches/newnet/src/multijoin.c
    branches/newnet/src/multimenu.c
    branches/newnet/src/multiplay.c
    branches/newnet/src/projectile.c
    branches/newnet/src/radar.c
    branches/newnet/src/radar.h
    branches/newnet/src/scriptai.c
    branches/newnet/src/scriptfuncs.c
    branches/newnet/src/stats.c
    branches/newnet/win32/Warzone2100.vcproj
    branches/newnet/win32/libs/png/Makefile

Added Paths:
-----------
    branches/newnet/lib/ivis_common/jpeg_encoder.c
    branches/newnet/lib/ivis_common/jpeg_encoder.h
    branches/newnet/src/astar.cpp

Removed Paths:
-------------
    branches/newnet/src/astar.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.