Merge branch 'pentool' into brushtool

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

1 files changed, 0 insertions, 13 deletions

diff --git a/js/panels/Timeline/TimelineController.js b/js/panels/Timeline/TimelineController.js
deleted file mode 100644
index 6602994d..00000000
--- a/js/panels/Timeline/TimelineController.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* <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> */
-
-var Montage = require("montage/core/core").Montage;
-
-var TimelineController = exports.TimelineController = Montage.create(Montage, {
-
-    
-
-});
\ No newline at end of file