[Opengeoscience-developers] OpenGeoscience branch, 54-2-workflow-construction, updated. f96bfdda8068d21d2a6244501ceddc990292a2a3
Ben Burnett
bburnett at poly.edu
Wed Sep 4 20:24:01 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenGeoscience".
The branch, 54-2-workflow-construction has been updated
via f96bfdda8068d21d2a6244501ceddc990292a2a3 (commit)
via 8e4ef7b70bd5018fe46503753b18a0110d4532a5 (commit)
via 0927e4dc6aafd69b47e26bc75ac8fdce1a1392dc (commit)
via fc2c082e01bcf5ad8f306db7ac6dfce3c5cb42a7 (commit)
via 4e64eb5b541e571b53a19b95bb150703bf30f24e (commit)
via 10eeed150747033df5bf7817dae35a1e6ad80a59 (commit)
via 2bd8dfb762de8e80a2c59037112525e8f5b22b2d (commit)
via 05e76b13619646c3cae005b16c53eef0be99f3c6 (commit)
via 722522e19effb92047fcc2498c6407527773267c (commit)
via 77954a8840ea6767777ca7070eceb55f34320e64 (commit)
via 08b0206a51002c5e796d0130e7c72a6f8832481a (commit)
via ad464574b7d20929be51216873d82a08e12f22c9 (commit)
via 0cdca793346dfbb4858f8a99f6689426bef9e1eb (commit)
via 9fa481aee50a3bd8c5a6c002c0b75ae6c02307db (commit)
via a3f499e0a8a5745343561c4f058699702c438a29 (commit)
via ab4d38e14625eb8780109ec991afc6b49ec4afdd (commit)
via 6a1df40e345cbf0637da9ab30f84866bda859a92 (commit)
via 94df2bb6923d5e0963cc65cbd715d99b417c137e (commit)
via be8e93729460c7dd920f5c89217a6e893612ae35 (commit)
via c16edb836318b77d8d46b48af085d92753045bda (commit)
via de9979365e6d13cd15b29e799322e8d9a3fac0e0 (commit)
via 03a81a9178bdc58a57579934361368936aacadf3 (commit)
via e803f3807dea3f86bfe086a25555f8961c78e9e0 (commit)
via 28108d0c812a11ef2a0f3665b2ee20d8cffaeae3 (commit)
via 8773a7e525e27d920f0c1761e089420c74b2686d (commit)
via f579f56a14bd61b4a11f17063d8782bd09f44670 (commit)
via 37cb30a6f223671a6aee940bd9ec0ef84a4b9873 (commit)
via 57d57e2aacce0695708c81a534b624d92467ff0a (commit)
via 0cd70949a64fb540fb7ddb9f75c3c279b5989649 (commit)
via 0e46d8eadff1ce10a8a6b80a65087a879dea262f (commit)
via 508d2316322a10b83e33e298babc5fde73c80d8e (commit)
via 788687706e767d357cf98820092e28fe892c4356 (commit)
via a95c89b21e16cbd78b4a684a5a4f30875ad83d2a (commit)
via 00fb89ec9bbe49a58824d24f76ed82c41fd61bf8 (commit)
via f0965dfa75049af6a820a83d1d770408625026ec (commit)
via d5cae73e95a2398f216d5edb670103a39515a141 (commit)
via 9c94bff3ed75e1ee8b2562ffd87a1e825068d8fd (commit)
via 6cab24c4a1a65ea9453a977b1af7f33eb96f67d6 (commit)
via ce9c05651656251fcd52d22df7a598f4232a8fa7 (commit)
via 1e26fd6687e966a6acae83956709d9d25ff5b3dd (commit)
via a0ec8b8ca168d6d706c38e7bd02c1546adf97c26 (commit)
via 6291ba5fc5a366529ae93ddf7bfd6a7cf1bb0b57 (commit)
via 5d6f738f57dae86bf43346a223754403f5f876fe (commit)
via 66fe8d0aec6d86fb287537ba7da243d3d40a639f (commit)
from a6297198533f8f4e9ab30bbb5350673726004413 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=f96bfdda8068d21d2a6244501ceddc990292a2a3
commit f96bfdda8068d21d2a6244501ceddc990292a2a3
Merge: a629719 8e4ef7b
Author: Ben Burnett <bburnett at poly.edu>
Date: Wed Sep 4 20:23:01 2013 -0400
Merge branch 'master' into 54-2-workflow-construction
merged with --theirs since I made no vgl changes
Conflicts:
web/lib/geoweb.min.js
web/lib/vgl/actor.js
web/lib/vgl/blend.js
web/lib/vgl/boundingObject.js
web/lib/vgl/command.js
web/lib/vgl/data.js
web/lib/vgl/defaultValue.js
web/lib/vgl/geojsonReader.js
web/lib/vgl/geomData.js
web/lib/vgl/groupNode.js
web/lib/vgl/init.js
web/lib/vgl/interactorStyle.js
web/lib/vgl/legend.js
web/lib/vgl/lineSource.js
web/lib/vgl/mapper.js
web/lib/vgl/material.js
web/lib/vgl/materialAttribute.js
web/lib/vgl/modelViewMatrixStack.js
web/lib/vgl/node.js
web/lib/vgl/object.js
web/lib/vgl/picker.js
web/lib/vgl/planeSource.js
web/lib/vgl/pointSource.js
web/lib/vgl/renderer.js
web/lib/vgl/shader.js
web/lib/vgl/shaderProgram.js
web/lib/vgl/source.js
web/lib/vgl/texture.js
web/lib/vgl/timestamp.js
web/lib/vgl/trackballInteractorStyle.js
web/lib/vgl/uniform.js
web/lib/vgl/utils.js
web/lib/vgl/vertexAttribute.js
web/lib/vgl/viewer.js
web/lib/vgl/visitor.js
web/lib/vgl/vtkUnpack.js
CMakeLists.txt | 1 -
modules/esgf/__init__.py | 11 +-
modules/mongo.py | 4 +-
web/apps/archive/archive.js | 115 ++++++---
web/lib/geo/feature.js | 6 +-
web/lib/geo/latlng.js | 2 +-
web/lib/geoweb.min.js | 31 +++
web/lib/ui/gis.js | 8 +
web/lib/vgl/actor.js | 80 +++++--
web/lib/vgl/blend.js | 30 ++-
web/lib/vgl/boundingObject.js | 4 +-
web/lib/vgl/camera.js | 16 +-
web/lib/vgl/command.js | 2 +-
web/lib/vgl/data.js | 8 +-
web/lib/vgl/defaultValue.js | 2 +-
web/lib/vgl/freezeObject.js | 2 +-
web/lib/vgl/geojsonReader.js | 2 +-
web/lib/vgl/geomData.js | 418 +++++++++++++++++++------------
web/lib/vgl/groupMapper.js | 55 +++--
web/lib/vgl/groupNode.js | 116 ++++++++--
web/lib/vgl/init.js | 2 +-
web/lib/vgl/interactorStyle.js | 63 +++++-
web/lib/vgl/legend.js | 48 +++-
web/lib/vgl/lineSource.js | 35 ++-
web/lib/vgl/mapper.js | 205 +++++++++-------
web/lib/vgl/material.js | 153 +++++++++---
web/lib/vgl/materialAttribute.js | 78 ++++++-
web/lib/vgl/modelViewMatrixStack.js | 24 ++-
web/lib/vgl/node.js | 78 +++++--
web/lib/vgl/object.js | 14 +-
web/lib/vgl/picker.js | 7 +
web/lib/vgl/planeSource.js | 75 ++++--
web/lib/vgl/pointSource.js | 49 +++-
web/lib/vgl/renderWindow.js | 111 ++++++---
web/lib/vgl/renderer.js | 156 +++++++++---
web/lib/vgl/shader.js | 66 ++++--
web/lib/vgl/shaderProgram.js | 210 +++++++++++++---
web/lib/vgl/source.js | 6 +-
web/lib/vgl/texture.js | 200 ++++++++++++++-
web/lib/vgl/timestamp.js | 14 +-
web/lib/vgl/trackballInteractorStyle.js | 41 +++-
web/lib/vgl/uniform.js | 117 ++++++++-
web/lib/vgl/utils.js | 244 ++++++++++--------
web/lib/vgl/vertexAttribute.js | 49 +++-
web/lib/vgl/viewer.js | 122 ++++++++--
web/lib/vgl/visitor.js | 205 +++++++++++-----
web/lib/vgl/vtkUnpack.js | 284 ---------------------
47 files changed, 2428 insertions(+), 1141 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 1 -
modules/esgf/__init__.py | 11 +-
modules/mongo.py | 4 +-
web/apps/archive/archive.js | 115 ++++++---
web/lib/geo/feature.js | 6 +-
web/lib/geo/latlng.js | 2 +-
web/lib/geoweb.min.js | 31 +++
web/lib/ui/gis.js | 8 +
web/lib/vgl/actor.js | 80 +++++--
web/lib/vgl/blend.js | 30 ++-
web/lib/vgl/boundingObject.js | 4 +-
web/lib/vgl/camera.js | 16 +-
web/lib/vgl/command.js | 2 +-
web/lib/vgl/data.js | 8 +-
web/lib/vgl/defaultValue.js | 2 +-
web/lib/vgl/freezeObject.js | 2 +-
web/lib/vgl/geojsonReader.js | 2 +-
web/lib/vgl/geomData.js | 418 +++++++++++++++++++------------
web/lib/vgl/groupMapper.js | 55 +++--
web/lib/vgl/groupNode.js | 116 ++++++++--
web/lib/vgl/init.js | 2 +-
web/lib/vgl/interactorStyle.js | 63 +++++-
web/lib/vgl/legend.js | 48 +++-
web/lib/vgl/lineSource.js | 35 ++-
web/lib/vgl/mapper.js | 205 +++++++++-------
web/lib/vgl/material.js | 153 +++++++++---
web/lib/vgl/materialAttribute.js | 78 ++++++-
web/lib/vgl/modelViewMatrixStack.js | 24 ++-
web/lib/vgl/node.js | 78 +++++--
web/lib/vgl/object.js | 14 +-
web/lib/vgl/picker.js | 7 +
web/lib/vgl/planeSource.js | 75 ++++--
web/lib/vgl/pointSource.js | 49 +++-
web/lib/vgl/renderWindow.js | 111 ++++++---
web/lib/vgl/renderer.js | 156 +++++++++---
web/lib/vgl/shader.js | 66 ++++--
web/lib/vgl/shaderProgram.js | 210 +++++++++++++---
web/lib/vgl/source.js | 6 +-
web/lib/vgl/texture.js | 200 ++++++++++++++-
web/lib/vgl/timestamp.js | 14 +-
web/lib/vgl/trackballInteractorStyle.js | 41 +++-
web/lib/vgl/uniform.js | 117 ++++++++-
web/lib/vgl/utils.js | 244 ++++++++++--------
web/lib/vgl/vertexAttribute.js | 49 +++-
web/lib/vgl/viewer.js | 122 ++++++++--
web/lib/vgl/visitor.js | 205 +++++++++++-----
web/lib/vgl/vtkUnpack.js | 284 ---------------------
47 files changed, 2428 insertions(+), 1141 deletions(-)
create mode 100644 web/lib/geoweb.min.js
delete mode 100644 web/lib/vgl/vtkUnpack.js
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list