[OpenLayers-Commits] r11757 - trunk/openlayers/tools

[commits-20090109 at openlayers.org]

Author: tschaub
Date: 2011-03-29 12:04:40 -0700 (Tue, 29 Mar 2011)
New Revision: 11757

Modified:
   trunk/openlayers/tools/mergejs.py
Log:
Making it so the merge tool supports @require directives in addition to @requires.

Modified: trunk/openlayers/tools/mergejs.py
===================================================================
--- trunk/openlayers/tools/mergejs.py	2011-03-29 18:49:27 UTC (rev 11756)
+++ trunk/openlayers/tools/mergejs.py	2011-03-29 19:04:40 UTC (rev 11757)
@@ -43,7 +43,7 @@
 
 SUFFIX_JAVASCRIPT = ".js"
 
-RE_REQUIRE = "@requires:? (.*)\n" # TODO: Ensure in comment?
+RE_REQUIRE = "@requires?:? (.*)\n" # TODO: Ensure in comment?
 
 class MissingImport(Exception):
     """Exception raised when a listed import is not found in the lib."""