[Opengeoscience-developers] OpenGeoscience branch, next, updated. 11da625d76d80e7f3d84595130472140cfcd894a

[Aashish Chaudhary]

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, next has been updated
       via  11da625d76d80e7f3d84595130472140cfcd894a (commit)
       via  15701d142f2aaac94d611ccc3e865be5c4b71831 (commit)
      from  ce3e40db3e60d399949d1ed2043170c2f4369fa4 (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=11da625d76d80e7f3d84595130472140cfcd894a
commit 11da625d76d80e7f3d84595130472140cfcd894a
Merge: ce3e40d 15701d1
Author: Aashish Chaudhary <aashish.chaudhary at kitware.com>
Date:   Tue Aug 20 20:39:57 2013 -0400

    Merge remote-tracking branch 'origin/102-animation-controls' into next
    
    * origin/102-animation-controls:
      Add animation controls to UI
    
    Conflicts:
    	web/apps/archive/archive.js

 web/apps/archive/archive.js |    6 ++
 web/lib/geo/map.js          |   88 +++++++++++++++++++------
 web/lib/ui/gis.js           |  153 +++++++++++++++++++++++++++++++++++++++----
 3 files changed, 213 insertions(+), 34 deletions(-)

-----------------------------------------------------------------------

Summary of changes:
 web/apps/archive/archive.js |    6 ++
 web/lib/geo/map.js          |   88 +++++++++++++++++++------
 web/lib/ui/gis.js           |  153 +++++++++++++++++++++++++++++++++++++++----
 3 files changed, 213 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
OpenGeoscience