Skip to content
Browse files

Merge branch 'stream_reader' of github.com:gburgett/jdom into stream_…

…reader

Conflicts:
	core/src/java/org/jdom2/jaxb/JDOMStreamReader.java
	test/src/java/org/jdom2/test/cases/output/TestStAXWriterReader.java
  • Loading branch information...
2 parents 9b019b1 + 660ae11 commit 7bfd2166023659cf1baa99698fc59789f0a1f621 @rolfl rolfl committed Jan 6, 2013
Showing with 0 additions and 0 deletions.

0 comments on commit 7bfd216

Please sign in to comment.
Something went wrong with that request. Please try again.