Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/lib/drawing/world.js

1 files changed, 0 insertions, 13 deletions

diff --git a/js/lib/nj-base.js b/js/lib/nj-base.js
deleted file mode 100755
index d1e1ff5b..00000000
--- a/js/lib/nj-base.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> */
-
-//nj-base: Contains base class definitions to use as Ninja building blocks.
-var Montage     = require("montage/core/core").Montage,
-    Component   = require("montage/ui/component").Component;
-
-exports.NJComponent = Montage.create( Component, {
-
-});
\ No newline at end of file