Skip to content
Snippets Groups Projects
Commit 34a26ba3 authored by Olivier Langella's avatar Olivier Langella
Browse files

Merge branch 'master' of ssh://git.renater.fr:2222/libodsstream

Conflicts:
	generateJar.ant
	src/fr/inra/pappso/libodsstream/OdsDocReader.java
	src/fr/inra/pappso/libodsstream/OdsDocWriter.java
	src/fr/inra/pappso/libodsstream/reader/OdsCell.java
	src/fr/inra/pappso/libodsstream/saxreader/SaxHandlerContentXml.java
	src/fr/inra/pappso/libodsstream/saxreader/SaxOdsDocReader.java
	src/fr/inra/pappso/libodsstream/structure/ContentXml.java
	src/fr/inra/pappso/libodsstream/structure/StylesXml.java
parents 239eb147 65e28e36
No related branches found
No related tags found
No related merge requests found
Showing
with 1102 additions and 738 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment