Merge pull request #41 from googlesamples/release-gemma

release-gemma
googlearchive · Feb 9, 2016 · f6b3729 · f6b3729
2 parents 0ae6bbe + c94e7c6
commit f6b3729
Show file tree

Hide file tree

Showing 342 changed files with 441 additions and 19,349 deletions.
diff --git a/MotionTrackingTutorialStart/Assets/Scripts/CameraWASD.cs b/MotionTrackingTutorialStart/Assets/Scripts/CameraWASD.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="AndroidHelper.cs" company="Google">
 //
-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/MotionTrackingTutorialStart/Settings.StyleCop b/MotionTrackingTutorialStart/Settings.StyleCop
@@ -119,7 +119,7 @@
       </Rules>
       <AnalyzerSettings>
         <StringProperty Name="CompanyName">Google</StringProperty>
-        <StringProperty Name="Copyright">Copyright 2015 Google Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</StringProperty>
+        <StringProperty Name="Copyright">Copyright 2016 Google Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</StringProperty>
         <BooleanProperty Name="IncludeFields">False</BooleanProperty>
       </AnalyzerSettings>
     </Analyzer>

diff --git a/...ffects (Pro Only)/ImageEffectBase.cs.meta → ...sets/DetectTangoCoreGUIController.cs.meta b/...ffects (Pro Only)/ImageEffectBase.cs.meta → ...sets/DetectTangoCoreGUIController.cs.meta
diff --git a/UnityExamples/Assets/Editor/BuildTools.cs b/UnityExamples/Assets/Editor/BuildTools.cs
@@ -1,6 +1,6 @@
 // <copyright file="BuildTools.cs" company="Google">
 //
-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/UnityExamples/Assets/Editor/BuildUtil.cs b/UnityExamples/Assets/Editor/BuildUtil.cs
@@ -1,6 +1,6 @@
 // <copyright file="BuildUtil.cs" company="Google">
 //
-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/UnityExamples/Assets/Editor/GitHelpers.cs b/UnityExamples/Assets/Editor/GitHelpers.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="GitHelpers.cs" company="Google">
 //
-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/UnityExamples/Assets/Google-Unity/Scripts/AndroidHelper.cs b/UnityExamples/Assets/Google-Unity/Scripts/AndroidHelper.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="AndroidHelper.cs" company="Google">
 //
-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/UnityExamples/Assets/Google-Unity/Scripts/AndroidLifecycle.cs b/UnityExamples/Assets/Google-Unity/Scripts/AndroidLifecycle.cs
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------------------
 // <copyright file="AndroidLifecycle.cs" company="Google">
 //
-// Copyright 2015 Google Inc. All Rights Reserved.
+// Copyright 2016 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/UnityExamples/Assets/Standard Assets.meta b/UnityExamples/Assets/Standard Assets.meta
diff --git a/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only).meta b/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only).meta
diff --git a/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only)/AmbientObscurance.js b/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only)/AmbientObscurance.js
diff --git a/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only)/AmbientObscurance.js.meta b/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only)/AmbientObscurance.js.meta
diff --git a/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only)/AntialiasingAsPostEffect.js b/UnityExamples/Assets/Standard Assets/Image Effects (Pro Only)/AntialiasingAsPostEffect.js
diff --git a/...Examples/Assets/Standard Assets/Image Effects (Pro Only)/AntialiasingAsPostEffect.js.meta b/...Examples/Assets/Standard Assets/Image Effects (Pro Only)/AntialiasingAsPostEffect.js.meta