[Opengeoscience-developers] OpenGeoscience branch, master, updated. 8b71fbae1ca132d5f5dc132fd00f1252d58cf514
Aashish Chaudhary
aashish.chaudhary at kitware.com
Wed Aug 21 00:40:46 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, master has been updated
via 8b71fbae1ca132d5f5dc132fd00f1252d58cf514 (commit)
via a7c2664914770e24d8e98d3193368c07f5992269 (commit)
via f9b8dd5db4fb06d9276b83d0226836f4eadaac96 (commit)
via 02b7cd186d102be9ffb85380073e7c92c4540976 (commit)
via 3a3c69cbc4df0013be943403919d85ccd22d4b19 (commit)
via b8425c5fe4b8124e84bb1cc150ae19745fd0daf7 (commit)
via 15701d142f2aaac94d611ccc3e865be5c4b71831 (commit)
via c1ca62e7e94560f968df931156e778adb8d75cd6 (commit)
via bd593ac16512fcb4253e2d7e7209a0dfa783b2f4 (commit)
via b727c7491d8ef97ea17f24bd1c6bae5762de8ded (commit)
via b893cdff94fb5ea56b1b9cb316983729c38ccbe6 (commit)
via 53f59300b1410d8e52582730ee1b1a9e34862170 (commit)
via 7850902f7eb60daf2e1154b0a20a9ba1dc489de2 (commit)
via 425ff270d498d26d80ad41c1cfab2cc4fc4eb35f (commit)
via b2bae288df4fd1672713786ef8a269286d916ac1 (commit)
from 0667845e9d8ff6bc1baa71e806b842041f569422 (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=8b71fbae1ca132d5f5dc132fd00f1252d58cf514
commit 8b71fbae1ca132d5f5dc132fd00f1252d58cf514
Merge: 0667845 a7c2664
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date: Wed Aug 21 00:40:32 2013 -0400
Merge remote-tracking branch 'origin/102-animation-controls'
* origin/102-animation-controls:
Made animation step API private
Removed redundant declaration
Added API to decrement current animation step
Improved the API a bit
Fixing missing var declaration and API
Add animation controls to UI
Conflicts:
web/lib/geoweb.min.js
web/apps/archive/archive.js | 20 ++----
web/lib/geo/map.js | 155 ++++++++++++++++++++++++++++++++++++-------
web/lib/ui/gis.js | 153 ++++++++++++++++++++++++++++++++++++++----
3 files changed, 277 insertions(+), 51 deletions(-)
-----------------------------------------------------------------------
Summary of changes:
web/apps/archive/archive.js | 20 ++----
web/lib/geo/map.js | 155 ++++++++++++++++++++++++++++++++++++-------
web/lib/ui/gis.js | 153 ++++++++++++++++++++++++++++++++++++++----
3 files changed, 277 insertions(+), 51 deletions(-)
hooks/post-receive
--
OpenGeoscience
More information about the Opengeoscience-developers
mailing list