Sebastian Stenzel 0477a0a2e3 Merge branch 'patches-1.0.x' ...

# Conflicts:
#	main/filesystem-charsets/pom.xml

2016-05-10 14:49:20 +02:00

..

src/main/resources

new ant kit using a custom launcher binary due to #265

2016-05-10 14:26:06 +02:00

.gitignore

build ant-kit on tag/release [ci skip]

2016-04-10 01:53:44 +02:00

assembly.xml

new ant kit using a custom launcher binary due to #265

2016-05-10 14:26:06 +02:00

pom.xml

Merge branch 'patches-1.0.x'

2016-05-10 14:49:20 +02:00