net-p2p/amule: Resolve merge conflicts.
[gentoo.git] / games-util / atlas /
drwxr-xr-x   ..
-rw-r--r-- 390 Manifest
-rw-r--r-- 1711 atlas-0.5.0_p20141002.ebuild
-rw-r--r-- 332 metadata.xml