[vassalengine-svn] SF.net SVN: vassalengine:[8557] VASSAL-src/trunk

[<uck...@us...>]

Revision: 8557
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8557&view=rev
Author:   uckelman
Date:     2013-02-21 14:33:45 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
Merged Brent-3.2-New@8855.
Fixed Bug 9555: NoSuchFieldError in ExpressionInterpreter.evaluate()

Added Paths:
-----------
    VASSAL-src/trunk/lib/bsh-2.0b4-vassal.jar

Removed Paths:
-------------
    VASSAL-src/trunk/lib/bsh-2.0b4.jar

Property Changed:
----------------
    VASSAL-src/trunk/


Property changes on: VASSAL-src/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246,8260-8261,8309,8312,8317-8318
/VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252
/VASSAL-src/branches/Brent-3.2-New:8263,8267,8269-8272,8279-8283,8289,8295-8297,8305,8314,8329,8334-8335,8353,8357-8358,8362,8364,8369,8385-8386,8388,8400,8404,8414,8429-8430,8450-8453,8484,8539-8540
/VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995
/VASSAL-src/branches/george973-bugs:7800,7806,7962-7963
/VASSAL-src/branches/george973-bugs-3.2:8081
/VASSAL-src/branches/george973-ocs:8167-8169
/VASSAL-src/branches/lance-3.2 8085:8127
/VASSAL-src/branches/lancel-3.1:7680
/VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930
/VASSAL-src/branches/uckelman-integration:7971-8007
/VASSAL-src/branches/uckelman-working2:7194-7700
/VASSAL-src/branches/viewport-3.2:7992
   + /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246,8260-8261,8309,8312,8317-8318
/VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252
/VASSAL-src/branches/Brent-3.2-New:8263,8267,8269-8272,8279-8283,8289,8295-8297,8305,8314,8329,8334-8335,8353,8357-8358,8362,8364,8369,8385-8386,8388,8400,8404,8414,8429-8430,8450-8453,8484,8539-8540,8555
/VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995
/VASSAL-src/branches/george973-bugs:7800,7806,7962-7963
/VASSAL-src/branches/george973-bugs-3.2:8081
/VASSAL-src/branches/george973-ocs:8167-8169
/VASSAL-src/branches/lance-3.2 8085:8127
/VASSAL-src/branches/lancel-3.1:7680
/VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930
/VASSAL-src/branches/uckelman-integration:7971-8007
/VASSAL-src/branches/uckelman-working2:7194-7700
/VASSAL-src/branches/viewport-3.2:7992

Copied: VASSAL-src/trunk/lib/bsh-2.0b4-vassal.jar (from rev 8555, VASSAL-src/branches/Brent-3.2-New/lib/bsh-2.0b4-vassal.jar)
===================================================================
(Binary files differ)

Deleted: VASSAL-src/trunk/lib/bsh-2.0b4.jar
===================================================================
(Binary files differ)

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