Yueh-Hsuan Chiang a9a6a2f434 Merge pull request #764 from dmittendorf/fix-java-static-packaging ... Fix crossbuild jar packaging Conflicts: Makefile java/crossbuild/build-linux-centos.sh		2015-10-15 15:05:20 -07:00
..
build-linux-centos.sh	Merge pull request #764 from dmittendorf/fix-java-static-packaging	2015-10-15 15:05:20 -07:00
build-linux.sh	Moved Java main classes into src/main/java	2015-02-01 20:04:51 +00:00
Vagrantfile	Merge pull request #764 from dmittendorf/fix-java-static-packaging	2015-10-15 15:05:20 -07:00