[imposm-parser] 04/29: Merge commit 'upstream/1.0.2'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository imposm-parser.

commit d77a81ad23d1ef15a817952070d2204bed47f237
Merge: 68790da 6edefa7
Author: David Paleino <dapal at debian.org>
Date:   Sun Apr 24 20:37:24 2011 +0200

    Merge commit 'upstream/1.0.2'

 .hg/00changelog.i                                  | Bin 57 -> 0 bytes
 .hg/branch                                         |   1 -
 .hg/cache/branchheads                              |   2 -
 .hg/cache/tags                                     |   4 -
 .hg/dirstate                                       | Bin 1264 -> 0 bytes
 .hg/hgrc                                           |   2 -
 .hg/requires                                       |   4 -
 .hg/store/00changelog.i                            | Bin 7310 -> 0 bytes
 .hg/store/00manifest.i                             | Bin 7953 -> 0 bytes
 .hg/store/data/_c_h_a_n_g_e_s.i                    | Bin 327 -> 0 bytes
 .hg/store/data/_l_i_c_e_n_s_e.i                    | Bin 4019 -> 0 bytes
 .hg/store/data/_m_a_n_i_f_e_s_t.in.i               | Bin 682 -> 0 bytes
 .hg/store/data/_r_e_a_d_m_e.i                      | Bin 1435 -> 0 bytes
 .hg/store/data/doc/_makefile.i                     | Bin 1405 -> 0 bytes
 .hg/store/data/doc/make.bat.i                      | Bin 1226 -> 0 bytes
 .hg/store/data/doc/source/concepts.rst.i           | Bin 1280 -> 0 bytes
 .hg/store/data/doc/source/conf.py.i                | Bin 2800 -> 0 bytes
 .hg/store/data/doc/source/index.rst.i              | Bin 337 -> 0 bytes
 .hg/store/data/doc/source/install.rst.i            | Bin 711 -> 0 bytes
 .hg/store/data/doc/source/parsing.rst.i            | Bin 593 -> 0 bytes
 .hg/store/data/imposm/____init____.py.i            | Bin 120 -> 0 bytes
 .hg/store/data/imposm/parser/____init____.py.i     | Bin 193 -> 0 bytes
 .hg/store/data/imposm/parser/pbf/____init____.py.i | Bin 64 -> 0 bytes
 .hg/store/data/imposm/parser/pbf/multiproc.py.i    | Bin 2014 -> 0 bytes
 .hg/store/data/imposm/parser/pbf/osm.cc.i          | Bin 11936 -> 0 bytes
 .hg/store/data/imposm/parser/pbf/parser.py.i       | Bin 4346 -> 0 bytes
 .hg/store/data/imposm/parser/simple.py.i           | Bin 2458 -> 0 bytes
 .../data/imposm/parser/test/____init____.py.i      | Bin 64 -> 0 bytes
 .hg/store/data/imposm/parser/test/test.osm.bz2.i   | Bin 494 -> 0 bytes
 .hg/store/data/imposm/parser/test/test.osm.i       | Bin 439 -> 0 bytes
 .hg/store/data/imposm/parser/test/test.pbf.i       | Bin 394 -> 0 bytes
 .../imposm/parser/test/test__simple__parser.py.i   | Bin 1262 -> 0 bytes
 .hg/store/data/imposm/parser/util.py.i             | Bin 1181 -> 0 bytes
 .hg/store/data/imposm/parser/xml/____init____.py.i | Bin 64 -> 0 bytes
 .hg/store/data/imposm/parser/xml/multiproc.py.i    | Bin 3782 -> 0 bytes
 .hg/store/data/imposm/parser/xml/parser.py.i       | Bin 2010 -> 0 bytes
 .hg/store/data/imposm/parser/xml/util.py.i         | Bin 975 -> 0 bytes
 .hg/store/data/osm.proto.i                         | Bin 3001 -> 0 bytes
 .hg/store/data/setup.py.i                          | Bin 2429 -> 0 bytes
 .hg/store/data/tox.ini.i                           | Bin 588 -> 0 bytes
 .hg/store/data/~2ehgignore.i                       | Bin 177 -> 0 bytes
 .hg/store/data/~2ehgtags.i                         | Bin 237 -> 0 bytes
 .hg/store/fncache                                  |  33 ----
 .hg/store/undo                                     | Bin 1024 -> 0 bytes
 .hg/undo.branch                                    |   1 -
 .hg/undo.desc                                      |   3 -
 .hg/undo.dirstate                                  |   0
 .hgignore                                          |   5 -
 .hgtags                                            |   2 -
 PKG-INFO                                           |  76 ++++++++
 doc/Makefile                                       | 130 -------------
 doc/make.bat                                       | 170 ----------------
 doc/source/concepts.rst                            |  97 ---------
 doc/source/conf.py                                 | 216 ---------------------
 doc/source/index.rst                               |  19 --
 doc/source/install.rst                             |  30 ---
 doc/source/parsing.rst                             |  24 ---
 imposm.parser.egg-info/PKG-INFO                    |  76 ++++++++
 imposm.parser.egg-info/SOURCES.txt                 |  29 +++
 imposm.parser.egg-info/dependency_links.txt        |   1 +
 imposm.parser.egg-info/namespace_packages.txt      |   1 +
 imposm.parser.egg-info/top_level.txt               |   1 +
 imposm/parser/example.py                           |  40 ++++
 setup.cfg                                          |   5 +
 tox.ini                                            |   7 -
 65 files changed, 229 insertions(+), 750 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/imposm-parser.git