Author: jbeard
Date: Fri Jun 25 14:33:24 2010
New Revision: 957990
URL: http://svn.apache.org/viewvc?rev=957990&view=rev
Log:
Updated branch from trunk.
Modified:
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/ (props
changed)
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/java/
(props changed)
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/js/requirejs/
(props changed)
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/js/requirejs/require/
(props changed)
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/test-java/
(props changed)
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/test-js/
(props changed)
Propchange: commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 25 14:33:24 2010
@@ -0,0 +1,2 @@
+build_dbg.sh
+build
Propchange: commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 25 14:33:24 2010
@@ -1,2 +1,2 @@
/commons/sandbox/gsoc/2010/scxml-js/branches/browser-tests.1.ie:954350-956951
-/commons/sandbox/gsoc/2010/scxml-js/trunk:957703-957778
+/commons/sandbox/gsoc/2010/scxml-js/trunk:957703-957989
Propchange:
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 25 14:33:24 2010
@@ -0,0 +1 @@
+*.jar
Propchange:
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/js/requirejs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 25 14:33:24 2010
@@ -0,0 +1,8 @@
+build
+dist
+docs
+LICENSE
+README.md
+require.js
+tasks.txt
+tests
Propchange:
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/js/requirejs/require/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 25 14:33:24 2010
@@ -0,0 +1,5 @@
+i18n.js
+jsonp.js
+rhino.js
+text.js
+transportD.js
Propchange:
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/test-java/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 25 14:33:24 2010
@@ -0,0 +1 @@
+*.jar
Propchange:
commons/sandbox/gsoc/2010/scxml-js/branches/core-module.SCXML-137/lib/test-js/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 25 14:33:24 2010
@@ -0,0 +1 @@
+dojo-release-1.4.2-src
