Merge branch 'master' of github.com:regularjs/regular

Conflicts: src/Regular.js
regularjs · Feb 26, 2015 · c4006ec · c4006ec
2 parents e39d0b2 + 5751363
commit c4006ec
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2012-2014 zheng haibo(leeluolee). and regular contributors
+Copyright (c) 2012-2015  NetEase, Inc. and regularjs contributors. 
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/dist/regular.js b/dist/regular.js
@@ -1,6 +1,6 @@
 /**
 @author	leeluolee
-@version	0.3.0
+@version	0.3.1
 @homepage	http://regularjs.github.io
 */
 ;(function(){

diff --git a/test/regular.js b/test/regular.js
@@ -1,6 +1,6 @@
 /**
 @author	leeluolee
-@version	0.3.0
+@version	0.3.1
 @homepage	http://regularjs.github.io
 */
 

diff --git a/test/spec/test-lexer.js b/test/spec/test-lexer.js
@@ -1,4 +1,5 @@
 var Lexer = require_lib("parser/Lexer.js");
+var config = require_lib("config.js");
 
 /**
  * setup template
@@ -67,6 +68,12 @@ describe("Lexer under mode 1 and 2", function(){
 
   })
 
+  it("config should work", function(){
+    config.END = "}}";
+    config.BEGIN = "{{";
+
+  })
+
 })