Merge branch 'master' into sqlite-refactor

This commit is contained in:
Dane Springmeyer 2011-11-03 19:53:57 -04:00
commit 58dee785b8

9
.gitignore vendored
View file

@ -25,3 +25,12 @@ utils/pgsql2sqlite/pgsql2sqlite
utils/svg2png/svg2png utils/svg2png/svg2png
demo/python/demo* demo/python/demo*
demo/python/map.xml demo/python/map.xml
tests/cpp_tests/svg_renderer_tests/background_color_test
tests/cpp_tests/svg_renderer_tests/combined_test
tests/cpp_tests/svg_renderer_tests/compilation_test
tests/cpp_tests/svg_renderer_tests/file_output_test
tests/cpp_tests/svg_renderer_tests/file_output_test_case.svg
tests/cpp_tests/svg_renderer_tests/path_element_test
tests/cpp_tests/svg_renderer_tests/path_element_test_case_1.svg
tests/cpp_tests/svg_renderer_tests/root_element_test
tests/data/sqlite/*index