This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libkml.
commit b40da4218771f96acc1a54b90f52d7f067c40eb3
Merge: fc5af44 f050f81
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Jul 26 18:37:12 2015 +0200
Merge tag 'upstream/1.3.0_r864+git20150726-3f3f37f'
Upstream version 1.3.0~r864+git20150726-3f3f37f
.travis.yml | 2 +
CMakeLists.txt | 72 ++++++++-----
cmake/FindMiniZip.cmake | 28 ++---
cmake/FindUriParser.cmake | 30 +++---
cmake/ImportBoost.cmake | 7 --
cmake/ImportEXPAT.cmake | 9 --
cmake/ImportGoogleTest.cmake | 8 --
cmake/ImportMinizip.cmake | 8 --
cmake/ImportUriParser.cmake | 8 --
cmake/ImportZLIB.cmake | 9 --
cmake/LibKMLHelper.cmake | 12 +--
cmake/pycompile.py | 3 +
examples/engine/Makefile.am | 106 ------------------
examples/java/run.sh | 2 +
examples/wxregionator/Makefile.am | 10 --
examples/wxviewer/Makefile.am | 8 --
libkml.sln | 50 ---------
src/CMakeLists.txt | 2 +-
src/kml/CMakeLists.txt | 2 +-
src/kml/base/CMakeLists.txt | 9 +-
src/swig/CMakeLists.txt | 95 ++++++++++++++++
src/swig/Makefile.am | 132 -----------------------
src/swig/java/Makefile.am | 2 -
src/swig/kmlbase.i | 19 ++--
src/swig/kmldom.i | 19 ++--
src/swig/{kmlelements.i => libkml_kmlelements.i} | 0
src/swig/python/Makefile.am | 2 -
testdata/Makefile.am | 3 -
testdata/atom/Makefile.am | 8 --
testdata/balloon/Makefile.am | 2 -
testdata/csv/Makefile.am | 10 --
testdata/deprecated/Makefile.am | 2 -
testdata/gdata/Makefile.am | 7 --
testdata/gmaps/Makefile.am | 2 -
testdata/gpx/Makefile.am | 2 -
testdata/gx/Makefile.am | 3 -
testdata/kml/Makefile.am | 27 -----
testdata/kmz/Makefile.am | 26 -----
testdata/kmz/files/Makefile.am | 5 -
testdata/kmz/kmzfiles/Makefile.am | 2 -
testdata/kmz/rumsey/Makefile.am | 1 -
testdata/kmz/rumsey/imagery/Makefile.am | 1 -
testdata/kmz/rumsey/kml/Makefile.am | 4 -
testdata/links/Makefile.am | 2 -
testdata/style/Makefile.am | 33 ------
testdata/style/weather/Makefile.am | 14 ---
testdata/update/Makefile.am | 21 ----
testdata/xal/Makefile.am | 2 -
testdata/xsd/Makefile.am | 2 -
tests/CMakeLists.txt | 2 +-
tests/swig/CMakeLists.txt | 19 ++++
{src => tests}/swig/KmlBaseTest.java | 0
{src => tests}/swig/kmlbase_test.py | 0
{src => tests}/swig/kmldom_test.py | 0
{src => tests}/swig/kmlengine_test.py | 0
xcode/LibKML/Makefile.am | 5 -
xcode/Makefile.am | 2 -
57 files changed, 232 insertions(+), 629 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libkml.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
