net-p2p/amule: Resolve merge conflicts.
[gentoo.git] / dev-java / osgi-compendium /
drwxr-xr-x   ..
-rw-r--r-- 379 Manifest
-rw-r--r-- 158 metadata.xml
-rw-r--r-- 844 osgi-compendium-4.3.1.ebuild