From 0892b27e326f14bd3f6229b55077ef5f9d5280b4 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 21 May 2011 18:14:36 +0000
Subject: branch/3.1: merged bugfixes from trunk/ up to current

---
 framework/Web/Javascripts/source/packages.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/Web/Javascripts/source/packages.php')

diff --git a/framework/Web/Javascripts/source/packages.php b/framework/Web/Javascripts/source/packages.php
index b9b4c7bf..696e315d 100644
--- a/framework/Web/Javascripts/source/packages.php
+++ b/framework/Web/Javascripts/source/packages.php
@@ -3,8 +3,8 @@
 //$Id$
 
 // To make future upgrades easier
-if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.6.0.3');
-if (!defined('SCRIPTACULOUS_DIR')) define ('SCRIPTACULOUS_DIR', 'scriptaculous-1.8.2');
+if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.7');
+if (!defined('SCRIPTACULOUS_DIR')) define ('SCRIPTACULOUS_DIR', 'scriptaculous-1.9.0');
 
 //package names and its contents (files relative to the current directory)
 $packages = array(
@@ -39,7 +39,7 @@ $packages = array(
 
 	'ajax' => array(
 		SCRIPTACULOUS_DIR.'/controls.js',
-		'prado/activecontrols/json.js',
+		'prado/activecontrols/json2.js',
 		'prado/activecontrols/ajax3.js',
 		'prado/activecontrols/activecontrols3.js',
 		'prado/activecontrols/inlineeditor.js'
-- 
cgit v1.2.3