Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues 599 #645

Merged
merged 19 commits into from
Dec 13, 2014
Merged

Issues 599 #645

merged 19 commits into from
Dec 13, 2014

Conversation

abellgithub
Copy link
Contributor

No description provided.

Conflicts:
	plugins/sqlite/drivers/SQLiteCommon.hpp
Remove exceptions from XML schema.
Remove pointer wrappers.
Remove storage of DimTypes (use XMLDims instead)
Conflicts:
	plugins/pgpointcloud/test/PgpointcloudWriterTest.cpp
Conflicts:
	plugins/oci/io/OciWriter.hpp
	plugins/pgpointcloud/io/PgWriter.cpp
	plugins/pgpointcloud/test/PgpointcloudWriterTest.cpp
	plugins/sqlite/io/SQLiteWriter.hpp
	src/CMakeLists.txt
	src/XMLSchema.cpp
Conflicts:
	kernels/info/InfoKernel.hpp
	plugins/pgpointcloud/test/PgpointcloudWriterTest.cpp
	plugins/sqlite/test/SQLiteTest.cpp
	src/StageFactory.cpp
	test/unit/CompressionTest.cpp
	test/unit/XMLSchemaTest.cpp
hobu added a commit that referenced this pull request Dec 13, 2014
@hobu hobu merged commit beb7d31 into master Dec 13, 2014
@abellgithub abellgithub deleted the issues-599 branch December 19, 2014 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants