Revision: 10166
          http://warzone2100.svn.sourceforge.net/warzone2100/?rev=10166&view=rev
Author:   cypr
Date:     2010-03-06 12:20:57 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
Merge branch 'master' into newnet

Conflicts:
        src/projectile.c

From: Cyp <c...@example.com>

Modified Paths:
--------------
    branches/newnet/src/baseobject.c
    branches/newnet/src/baseobject.h
    branches/newnet/src/component.c
    branches/newnet/src/display3d.c
    branches/newnet/src/droid.c
    branches/newnet/src/projectile.c
    branches/newnet/src/structure.c
    branches/newnet/src/visibility.c


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

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to