merge with master

This commit is contained in:
Steve Strassmann
2013-05-07 10:48:51 -04:00
6 changed files with 10 additions and 1 deletions

View File

@@ -1 +1,4 @@
# Please do not ignore *.js files. Some xmodules are written in JS.
# Ignore .js files in this folder as they are compiled from coffeescript
# For each of the xmodules subdirectories, add a .gitignore file that
# will version any *.js file that is specifically written, not compiled.
*.js

View File

@@ -0,0 +1,2 @@
!imageinput.js
!schematic.js

View File

@@ -0,0 +1 @@
!*.js

View File

@@ -0,0 +1 @@
!*.js

View File

@@ -0,0 +1 @@
!*.js

View File

@@ -0,0 +1 @@
!html5_video.js