[Opengeoscience-developers] OpenGeoscience branch, 161-list-variables-on-search, updated. master-no-submodule-84-g1f7781a

[Ben Burnett]

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, 161-list-variables-on-search has been updated
       via  1f7781a760f2602e18454bdc95d83f1edd315de0 (commit)
       via  c17ca2257b138ac3cb710e7ad40cc4fd25e98cfb (commit)
       via  edb92388c44affa2e8d82aa566a86ff1fd589c81 (commit)
       via  bda623a81c13ada1496c397fec6d858dfa6fe9da (commit)
       via  b95a0e1fc23234be91d5d12458d639c3d39e7989 (commit)
       via  36afd06f01c2284b7b31582210d7b8911393b8c2 (commit)
       via  bae0590f77d8ced6d70186b7d28f0679d65a41b3 (commit)
       via  de13a7644e9961e9c003cc96aa41ef4f66d961da (commit)
       via  8a19c8cebf3d00be400c161fe866c291b4f94b9e (commit)
       via  21d678468b40460414738eafd0192bf289b851d8 (commit)
       via  3ba7fb05084fac9e8f796401a6bb47b9bd87400f (commit)
       via  9295374d53af51446f56b08512e1d51f2f529a59 (commit)
       via  6990604ef03b0917d2463d3fd180f3e91491616f (commit)
       via  97aff5380f4ed85451fa2ec160bba92602d39708 (commit)
       via  625f0f17a531c042ed3a7cec0cb10e51d134bfe6 (commit)
       via  3b12004c23e4521cdef1d168e75727db2e34032a (commit)
       via  daa71c41a00f68353bea48610a51b1bd5c27526f (commit)
       via  4a8f240ab8b4c5ad7cb677b8ace94e224715c5bb (commit)
       via  b211e7d57d7fbe6d314fe7834ed02e37e772766a (commit)
       via  96354f6fb78c02364d125e96c5b0b30bfe671ffb (commit)
      from  be01223345a733dbe842a072a283b675a6d0c33e (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=1f7781a760f2602e18454bdc95d83f1edd315de0
commit 1f7781a760f2602e18454bdc95d83f1edd315de0
Author: Ben Burnett <benbu at nyu.edu>
Date:   Fri Jan 17 10:05:20 2014 -0700

    Update submodule

 web/lib/geojs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

http://public.kitware.com/gitweb?p=OpenGeoscience/geoweb.git;a=commitdiff;h=c17ca2257b138ac3cb710e7ad40cc4fd25e98cfb
commit c17ca2257b138ac3cb710e7ad40cc4fd25e98cfb
Merge: be01223 edb9238
Author: Ben Burnett <benbu at nyu.edu>
Date:   Fri Jan 17 10:04:12 2014 -0700

    Fix merge conflicts

 web/apps/archive/archive.css |    3 +-
 web/apps/archive/archive.js  |  120 ++++++++++++++++++++++++++++++++++++++----
 web/apps/archive/index.html  |   32 ++++++++---
 web/lib/geojs                |    2 +-
 4 files changed, 135 insertions(+), 22 deletions(-)

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

Summary of changes:
 web/apps/archive/archive.css |    3 +-
 web/apps/archive/archive.js  |  120 ++++++++++++++++++++++++++++++++++++++----
 web/apps/archive/index.html  |   32 ++++++++---
 web/lib/geojs                |    2 +-
 4 files changed, 135 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
OpenGeoscience