Author: muggenhor
Date: Tue Jul 10 15:20:52 2007
New Revision: 2049

URL: http://svn.gna.org/viewcvs/warzone?rev=2049&view=rev
Log:
 * Merge r1984:2048 from trunk into sound branch

Added:
    branches/sound/ChangeLog
      - copied unchanged from r2048, trunk/ChangeLog
    branches/sound/README
      - copied unchanged from r2048, trunk/README
    branches/sound/data/messages/cam2-outro.txt
      - copied unchanged from r2048, trunk/data/messages/cam2-outro.txt
    branches/sound/data/messages/cam2messages.txt
      - copied unchanged from r2048, trunk/data/messages/cam2messages.txt
    branches/sound/lib/framework/debug.c
      - copied unchanged from r2048, trunk/lib/framework/debug.c
    branches/sound/lib/framework/debug.h
      - copied unchanged from r2048, trunk/lib/framework/debug.h
    branches/sound/lib/framework/frame.c
      - copied unchanged from r2048, trunk/lib/framework/frame.c
    branches/sound/lib/ivis_common/pieblitfunc.h
      - copied unchanged from r2048, trunk/lib/ivis_common/pieblitfunc.h
    branches/sound/lib/ivis_common/pietypes.h
      - copied unchanged from r2048, trunk/lib/ivis_common/pietypes.h
    branches/sound/lib/ivis_opengl/pieblitfunc.c
      - copied unchanged from r2048, trunk/lib/ivis_opengl/pieblitfunc.c
    branches/sound/lib/ivis_opengl/tex.c
      - copied unchanged from r2048, trunk/lib/ivis_opengl/tex.c
    branches/sound/lib/sequence/Makefile.am
      - copied unchanged from r2048, trunk/lib/sequence/Makefile.am
    branches/sound/lib/sequence/adpcm.c
      - copied unchanged from r2048, trunk/lib/sequence/adpcm.c
    branches/sound/lib/sequence/adpcm.h
      - copied unchanged from r2048, trunk/lib/sequence/adpcm.h
    branches/sound/lib/sequence/dec130.c
      - copied unchanged from r2048, trunk/lib/sequence/dec130.c
    branches/sound/lib/sequence/dec130.h
      - copied unchanged from r2048, trunk/lib/sequence/dec130.h
    branches/sound/lib/sequence/rpl_reader.c
      - copied unchanged from r2048, trunk/lib/sequence/rpl_reader.c
    branches/sound/lib/sequence/rpl_reader.h
      - copied unchanged from r2048, trunk/lib/sequence/rpl_reader.h
    branches/sound/lib/sequence/sequence_stub.c
      - copied unchanged from r2048, trunk/lib/sequence/sequence_stub.c
    branches/sound/macosx/Warzone.xcodeproj/project.pbxproj
      - copied unchanged from r2048, 
trunk/macosx/Warzone.xcodeproj/project.pbxproj
    branches/sound/src/action.c
      - copied unchanged from r2048, trunk/src/action.c
    branches/sound/src/ai.c
      - copied unchanged from r2048, trunk/src/ai.c
    branches/sound/src/configuration.c
      - copied, changed from r2048, trunk/src/configuration.c
    branches/sound/src/design.c
      - copied, changed from r2048, trunk/src/design.c
    branches/sound/src/display.c
      - copied, changed from r2048, trunk/src/display.c
    branches/sound/src/display3d.c
      - copied, changed from r2048, trunk/src/display3d.c
    branches/sound/src/display3d.h
      - copied unchanged from r2048, trunk/src/display3d.h
    branches/sound/src/droid.c
      - copied, changed from r2048, trunk/src/droid.c
    branches/sound/src/droid.h
      - copied unchanged from r2048, trunk/src/droid.h
    branches/sound/src/effects.c
      - copied, changed from r2048, trunk/src/effects.c
    branches/sound/src/frontend.c
      - copied, changed from r2048, trunk/src/frontend.c
    branches/sound/src/function.c
      - copied unchanged from r2048, trunk/src/function.c
    branches/sound/src/game.c
      - copied, changed from r2048, trunk/src/game.c
    branches/sound/src/game.h
      - copied unchanged from r2048, trunk/src/game.h
    branches/sound/src/hci.c
      - copied unchanged from r2048, trunk/src/hci.c
    branches/sound/src/hci.h
      - copied unchanged from r2048, trunk/src/hci.h
    branches/sound/src/init.c
      - copied, changed from r2048, trunk/src/init.c
    branches/sound/src/init.h
      - copied unchanged from r2048, trunk/src/init.h
    branches/sound/src/levels.c
      - copied unchanged from r2048, trunk/src/levels.c
    branches/sound/src/loadsave.c
      - copied unchanged from r2048, trunk/src/loadsave.c
    branches/sound/src/mission.c
      - copied, changed from r2048, trunk/src/mission.c
    branches/sound/src/multibot.c
      - copied unchanged from r2048, trunk/src/multibot.c
    branches/sound/src/multiint.c
      - copied unchanged from r2048, trunk/src/multiint.c
    branches/sound/src/multilimit.c
      - copied unchanged from r2048, trunk/src/multilimit.c
    branches/sound/src/multistruct.c
      - copied unchanged from r2048, trunk/src/multistruct.c
    branches/sound/src/objmem.c
      - copied unchanged from r2048, trunk/src/objmem.c
    branches/sound/src/order.c
      - copied unchanged from r2048, trunk/src/order.c
    branches/sound/src/order.h
      - copied unchanged from r2048, trunk/src/order.h
    branches/sound/src/power.c
      - copied, changed from r2048, trunk/src/power.c
    branches/sound/src/projectile.c
      - copied, changed from r2048, trunk/src/projectile.c
    branches/sound/src/projectile.h
      - copied unchanged from r2048, trunk/src/projectile.h
    branches/sound/src/scriptai.c
      - copied unchanged from r2048, trunk/src/scriptai.c
    branches/sound/src/scriptobj.c
      - copied, changed from r2048, trunk/src/scriptobj.c
    branches/sound/src/scriptvals.c
      - copied unchanged from r2048, trunk/src/scriptvals.c
    branches/sound/src/scriptvals.h
      - copied unchanged from r2048, trunk/src/scriptvals.h
    branches/sound/src/scriptvals_parser.y
      - copied, changed from r2048, trunk/src/scriptvals_parser.y
    branches/sound/src/seqdisp.c
      - copied, changed from r2048, trunk/src/seqdisp.c
    branches/sound/src/structure.c
      - copied, changed from r2048, trunk/src/structure.c
    branches/sound/src/structure.h
      - copied unchanged from r2048, trunk/src/structure.h
    branches/sound/src/structuredef.h
      - copied unchanged from r2048, trunk/src/structuredef.h
    branches/sound/src/transporter.c
      - copied, changed from r2048, trunk/src/transporter.c
    branches/sound/tools/blender/pie_export.py
      - copied unchanged from r2048, trunk/tools/blender/pie_export.py
    branches/sound/tools/editworld/
      - copied from r2048, trunk/tools/editworld/
Modified:
    branches/sound/data/multiplay/skirmish/customai/   (props changed)
    branches/sound/data/multiplay/skirmish/customai/aivolution/   (props 
changed)
    branches/sound/icons/   (props changed)
    branches/sound/tools/blender/   (props changed)
    branches/sound/warzone2100.cbp


_______________________________________________
Warzone-commits mailing list
Warzone-commits@gna.org
https://mail.gna.org/listinfo/warzone-commits

Reply via email to