[gentoo-commits] proj/java:master commit in: /

[Andrew John Hughes]

commit:     32b5df0b488d61fdf64c159f2592529a9b562259
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Mon Aug 10 20:26:05 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Mon Aug 10 20:26:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=32b5df0b

Merge ../java.old

Conflicts:
        dev-java/cacao/ChangeLog

 dev-java/cacao/ChangeLog                           | 115 +++++++++++++++++++++
 ...cacao-1.6.0-r2.ebuild => cacao-1.6.0-r3.ebuild} |   0
 dev-java/cacao/files/javac.in                      |   4 +-
 3 files changed, 117 insertions(+), 2 deletions(-)