Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 5 insertions, 0 deletions

diff --git a/imports/codemirror/mode/rpm/spec/spec.css b/imports/codemirror/mode/rpm/spec/spec.css
new file mode 100755
index 00000000..d0a5d430
--- /dev/null
+++ b/imports/codemirror/mode/rpm/spec/spec.css
@@ -0,0 +1,5 @@
+.cm-s-default span.cm-preamble {color: #b26818; font-weight: bold;}
+.cm-s-default span.cm-macro {color: #b218b2;}
+.cm-s-default span.cm-section {color: green; font-weight: bold;}
+.cm-s-default span.cm-script {color: red;}
+.cm-s-default span.cm-issue {color: yellow;}