From 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Mon Sep 17 00:00:00 2001
From: Ciro Mattia Gonano <ciromattia@gmail.com>
Date: Wed, 11 Sep 2013 15:56:48 +0200
Subject: Merge up to r3319

---
 framework/Web/Javascripts/packages.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/framework/Web/Javascripts/packages.php b/framework/Web/Javascripts/packages.php
index 65921920..1d98f60f 100644
--- a/framework/Web/Javascripts/packages.php
+++ b/framework/Web/Javascripts/packages.php
@@ -1,6 +1,6 @@
 <?php
 
-//$Id: packages.php 3187 2012-07-12 11:21:01Z ctrlaltca $
+//$Id: packages.php 3319 2013-09-08 20:59:44Z ctrlaltca $
 
 // To make future upgrades easier
 if (!defined('PROTOTYPE_DIR')) define ('PROTOTYPE_DIR', 'prototype-1.7');
@@ -83,6 +83,10 @@ $packages = array(
 		'prado/controls/htmlarea.js'
 	),
 
+	'htmlarea4'=>array(
+		'prado/controls/htmlarea4.js'
+	),
+
 	'ratings' => array(
 		'prado/ratings/ratings.js',
 	),
@@ -113,6 +117,7 @@ $dependencies = array(
 		'dragdropextra'		=> array('prototype', 'prado', 'effects', 'ajax', 'dragdrop','dragdropextra'),
 		'accordion'			=> array('prototype', 'prado', 'effects', 'accordion'),
 		'htmlarea'			=> array('prototype', 'prado', 'htmlarea'),
+		'htmlarea4'			=> array('prototype', 'prado', 'htmlarea4'),
 		'ratings'			=> array('prototype', 'prado', 'effects', 'ajax', 'ratings'),
 		'inlineeditor'		=> array('prototype', 'prado', 'effects', 'ajax', 'inlineeditor'),
 );
-- 
cgit v1.2.3