[vassalengine-svn] SF.net SVN: vassalengine:[8500] ASL-src/trunk

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

Revision: 8500
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8500&view=rev
Author:   uckelman
Date:     2012-12-15 22:04:46 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Merged uckelman-3.2@8105.
Brings us up-to-date (mostly) with VASSAL 3.2 dependencies.

Modified Paths:
--------------
    ASL-src/trunk/lib/batik-anim.jar
    ASL-src/trunk/lib/batik-awt-util.jar
    ASL-src/trunk/lib/batik-bridge.jar
    ASL-src/trunk/lib/batik-codec.jar
    ASL-src/trunk/lib/batik-css.jar
    ASL-src/trunk/lib/batik-dom.jar
    ASL-src/trunk/lib/batik-ext.jar
    ASL-src/trunk/lib/batik-extension.jar
    ASL-src/trunk/lib/batik-gui-util.jar
    ASL-src/trunk/lib/batik-gvt.jar
    ASL-src/trunk/lib/batik-parser.jar
    ASL-src/trunk/lib/batik-script.jar
    ASL-src/trunk/lib/batik-svg-dom.jar
    ASL-src/trunk/lib/batik-svggen.jar
    ASL-src/trunk/lib/batik-swing.jar
    ASL-src/trunk/lib/batik-transcoder.jar
    ASL-src/trunk/lib/batik-util.jar
    ASL-src/trunk/lib/batik-xml.jar
    ASL-src/trunk/lib/smackx.jar
    ASL-src/trunk/lib/xalan-2.6.0.jar
    ASL-src/trunk/lib/xml-apis-ext.jar
    ASL-src/trunk/lib/xml-apis.jar

Added Paths:
-----------
    ASL-src/trunk/lib/TimingFramework-1.0.jar
    ASL-src/trunk/lib/base64-2.3.8.jar
    ASL-src/trunk/lib/bsh-2.0b4.jar
    ASL-src/trunk/lib/commons-codec-1.4.jar
    ASL-src/trunk/lib/commons-compiler.jar
    ASL-src/trunk/lib/commons-io-1.4.jar
    ASL-src/trunk/lib/commons-lang-2.5.jar
    ASL-src/trunk/lib/guava-r06.jar
    ASL-src/trunk/lib/janino.jar
    ASL-src/trunk/lib/jl1.0.1.jar
    ASL-src/trunk/lib/jna.jar
    ASL-src/trunk/lib/logback-classic-0.9.27.jar
    ASL-src/trunk/lib/logback-core-0.9.27.jar
    ASL-src/trunk/lib/miglayout-4.0-swing.jar
    ASL-src/trunk/lib/slf4j-api-1.6.4.jar
    ASL-src/trunk/lib/swing-worker-1.2.jar
    ASL-src/trunk/lib/swingx-0.9.4.jar
    ASL-src/trunk/lib/xercesImpl.jar

Removed Paths:
-------------
    ASL-src/trunk/lib/swing-worker-1.1.jar
    ASL-src/trunk/lib/swingx-0.9.2.jar

Property Changed:
----------------
    ASL-src/trunk/


Property changes on: ASL-src/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /ASL-src/branches/uckelman-3.2:8278,8303
   + /ASL-src/branches/uckelman-3.2:8105,8278,8303

Copied: ASL-src/trunk/lib/TimingFramework-1.0.jar (from rev 8105, ASL-src/branches/uckelman-3.2/lib/TimingFramework-1.0.jar)
===================================================================
--- ASL-src/trunk/lib/TimingFramework-1.0.jar	                        (rev 0)
+++ ASL-src/trunk/lib/TimingFramework-1.0.jar	2012-12-15 22:04:46 UTC (rev 8500)
@@ -0,0 +1,1174 @@
+PK
+