aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/html/javascripts/scriptaculous.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 259eb44e10..154e9afb38 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,6 +1,6 @@
*SVN*
-* Update Prototype to V1.4.0_pre11, script.aculo.us to [2502] and fix the rails generator to include the new .js files [Thomas Fuchs]
+* Update Prototype to V1.4.0_pre11, script.aculo.us to V1.5_rc3 [2504] and fix the rails generator to include the new .js files [Thomas Fuchs]
* Make the generator skip a file if it already exists and is identical to the new file.
diff --git a/railties/html/javascripts/scriptaculous.js b/railties/html/javascripts/scriptaculous.js
index f94af80c47..eeffc07d9e 100644
--- a/railties/html/javascripts/scriptaculous.js
+++ b/railties/html/javascripts/scriptaculous.js
@@ -20,7 +20,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
var Scriptaculous = {
- Version: '1.5_rc2',
+ Version: '1.5_rc3',
require: function(libraryName) {
// inserting via DOM fails in Safari 2.0, so brute force approach
document.write('<script type="text/javascript" src="'+libraryName+'"></script>');