[commits] Horde-Hatchery branch master updated. 86efe5ddd0607410cbc0724a3d48f5d6f5008149

[Michael Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 6eced17fa214f579531458e5e5b8b11df5eb1162

2ac5a1c... remove debug output
a63e1cd... Rename the Geodata widget to Geotag widget
86efe5d... Resolving conflict from upstream merge

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

commit 2ac5a1ce394f212498246306ac33934f79a82c47
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 31 16:56:59 2009 -0400

    remove debug output

 ansel/lib/Widget/Geodata.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/ansel/lib/Widget/Geodata.php?rt=horde-hatchery&r1=6eced17fa214f579531458e5e5b8b11df5eb1162&r2=2ac5a1ce394f212498246306ac33934f79a82c47

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

commit a63e1cd2bef4d0cfd0aa92d4ff167ffea76a0fe3
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 31 17:01:29 2009 -0400

    Rename the Geodata widget to Geotag widget

 ansel/config/styles.php.dist |    2 +-
 ansel/lib/View/Image.php     |    2 +-
 ansel/lib/Widget/Geodata.php |  243 ------------------------------------------
 ansel/lib/Widget/Geotag.php  |  243 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 245 insertions(+), 245 deletions(-)
 delete mode 100644 ansel/lib/Widget/Geodata.php
 create mode 100644 ansel/lib/Widget/Geotag.php

http://git.horde.org/diff.php/ansel/config/styles.php.dist?rt=horde-hatchery&r1=0395936f19ae533fdc096354b5b358da57ae8036&r2=a63e1cd2bef4d0cfd0aa92d4ff167ffea76a0fe3
http://git.horde.org/diff.php/ansel/lib/View/Image.php?rt=horde-hatchery&r1=f63e82e38e634b7b38d4fc0ccf90d1a5be943932&r2=a63e1cd2bef4d0cfd0aa92d4ff167ffea76a0fe3
http://git.horde.org/diff.php/ansel/lib/Widget/Geodata.php?rt=horde-hatchery&r1=2ac5a1ce394f212498246306ac33934f79a82c47&r2=a63e1cd2bef4d0cfd0aa92d4ff167ffea76a0fe3
http://git.horde.org/co.php/ansel/lib/Widget/Geotag.php?rt=horde-hatchery&r=a63e1cd2bef4d0cfd0aa92d4ff167ffea76a0fe3

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

commit 86efe5ddd0607410cbc0724a3d48f5d6f5008149
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 31 17:43:51 2009 -0400

    Resolving conflict from upstream merge

 ansel/js/src/googlemap.js |  170 +++++++++++++++++++++++----------------------
 ansel/map_edit.php        |    3 +-
 2 files changed, 87 insertions(+), 86 deletions(-)

http://git.horde.org/diff.php/ansel/js/src/googlemap.js?rt=horde-hatchery&r1=6eced17fa214f579531458e5e5b8b11df5eb1162&r2=86efe5ddd0607410cbc0724a3d48f5d6f5008149
http://git.horde.org/diff.php/ansel/map_edit.php?rt=horde-hatchery&r1=6eced17fa214f579531458e5e5b8b11df5eb1162&r2=86efe5ddd0607410cbc0724a3d48f5d6f5008149