From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/panels/Materials/Materials.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/panels/Materials/Materials.xml

(limited to 'js/panels/Materials/Materials.xml')

diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 805059d68087530721212a650412aefb85e98d1f Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 9 Feb 2012 10:26:57 -0800
Subject: Removed unused materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/panels/Materials/Materials.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'js/panels/Materials/Materials.xml')

diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index de07990e..d300b495 100644
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
-	  <leaf id="UberMaterial" label="Uber" />
+	    <leaf id="UberMaterial" label="Uber" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
+        <leaf id="LinearGradientMaterial" label="Linear Gradient" />
+        <leaf id="RadialGradientMaterial" label="Radial Gradient" />
+        <leaf id="FlatMaterial" label="Flat" />
     </folder>
     <folder id="customMaterials" label="Custom Materials">
         <leaf id="CheckerBoard" label="CheckerBoard" />
-- 
cgit v1.2.3


From 96a0a8c916533eb5625816192ed38488f639326d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:00:20 -0800
Subject: Integrating canvas-2d drawing and WebGL fixes, including adding back
 WebGL materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/panels/Materials/Materials.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/Materials/Materials.xml')

diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index e955623a..a958575e 100755
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
-	  <leaf id="UberMaterial" label="Uber" />
+	      <leaf id="UberMaterial" label="Uber" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
         <leaf id="LinearGradientMaterial" label="Linear Gradient" />
         <leaf id="RadialGradientMaterial" label="Radial Gradient" />
-- 
cgit v1.2.3


From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:36:19 -0800
Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including
 adding back WebGL materials."

This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
---
 js/panels/Materials/Materials.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/Materials/Materials.xml')

diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index a958575e..e955623a 100755
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
-	      <leaf id="UberMaterial" label="Uber" />
+	  <leaf id="UberMaterial" label="Uber" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
         <leaf id="LinearGradientMaterial" label="Linear Gradient" />
         <leaf id="RadialGradientMaterial" label="Radial Gradient" />
-- 
cgit v1.2.3


From d5b216d9d6d2b8cb93106e8f8ca351089d05b41d Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:52:31 -0800
Subject: Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL
 materials.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/panels/Materials/Materials.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/Materials/Materials.xml')

diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index e955623a..a958575e 100755
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
-	  <leaf id="UberMaterial" label="Uber" />
+	      <leaf id="UberMaterial" label="Uber" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
         <leaf id="LinearGradientMaterial" label="Linear Gradient" />
         <leaf id="RadialGradientMaterial" label="Radial Gradient" />
-- 
cgit v1.2.3