[OpenLayers-Commits] r7363 - in sandbox/topp/almanac: lib/OpenLayers tools

[commits at openlayers.org]

Author: tschaub
Date: 2008-06-16 17:09:37 -0400 (Mon, 16 Jun 2008)
New Revision: 7363

Modified:
   sandbox/topp/almanac/lib/OpenLayers/Ajax.js
   sandbox/topp/almanac/tools/mergejs.py
Log:
merge r7345:HEAD from trunk

Modified: sandbox/topp/almanac/lib/OpenLayers/Ajax.js
===================================================================
--- sandbox/topp/almanac/lib/OpenLayers/Ajax.js	2008-06-16 21:04:43 UTC (rev 7362)
+++ sandbox/topp/almanac/lib/OpenLayers/Ajax.js	2008-06-16 21:09:37 UTC (rev 7363)
@@ -2,6 +2,9 @@
  * license.  See http://svn.openlayers.org/trunk/openlayers/license.txt for the
  * full text of the license. */
 
+/**
+ * @requires OpenLayers/Request/XMLHttpRequest.js
+ */
 
 OpenLayers.ProxyHost = "";
 //OpenLayers.ProxyHost = "examples/proxy.cgi?url=";

Modified: sandbox/topp/almanac/tools/mergejs.py
===================================================================
--- sandbox/topp/almanac/tools/mergejs.py	2008-06-16 21:04:43 UTC (rev 7362)
+++ sandbox/topp/almanac/tools/mergejs.py	2008-06-16 21:09:37 UTC (rev 7363)
@@ -13,14 +13,6 @@
 #
 #    // @requires Geo/DataSource.js
 #
-#  or (ideally) within a class comment definition
-#
-#     /**
-#      * @class
-#      *
-#      * @requires OpenLayers/Layer.js
-#      */
-#
 # This script should be executed like so:
 #
 #     mergejs.py <output.js> <directory> [...]