net-p2p/amule: Resolve merge conflicts.
[gentoo.git] / dev-java / jsr322 /
drwxr-xr-x   ..
-rw-r--r-- 373 Manifest
-rw-r--r-- 546 jsr322-1.5.ebuild
-rw-r--r-- 159 metadata.xml