Merge branch 'master' of git://github.com/jwysiwyg/jwysiwyg into jwys…

…iwyg-master Conflicts: .gitignore README.rst Rakefile build.yml build/copyright.txt jquery.wysiwyg.js jquery.wysiwyg.less jquery.wysiwyg.no-alpha.gif src/jquery.wysiwyg.js
collibra · Apr 26, 2013 · f3ce386 · f3ce386
2 parents 9e531a1 + aa2cb21
commit f3ce386
Show file tree

Hide file tree

Showing 40 changed files with 7,934 additions and 2,709 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 jquery.wysiwyg.full.js
 jquery.wysiwyg.full.min.js
 help/bin/*.jar
-.project
+dist/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "build/jslint"]
+	path = build/jslint
+	url = https://github.com/douglascrockford/JSLint.git
+[submodule "build/uglify"]
+	path = build/uglify
+	url = https://github.com/mishoo/UglifyJS.git
+[submodule "test/lib/jasmine"]
+	path = test/lib/jasmine
+	url = https://github.com/pivotal/jasmine.git
+[submodule "test/lib/jquery"]
+	path = test/lib/jquery
+	url = https://github.com/jquery/jquery.git