Merge branch 'pentool' into brushtool

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

1 files changed, 11 insertions, 0 deletions

diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
new file mode 100644
index 00000000..b98b555d
--- /dev/null
+++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
@@ -0,0 +1,11 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+.trackspacer{
+    height:22px;
+    width: 100%;
+    background-color: #4d4d4d;
+}
\ No newline at end of file