Files
entropy/services
Fabio Erculiani d42003ba94 Merge remote-tracking branch 'origin/solo'
Conflicts:
	client/po/bg.po
	client/po/ca.po
	client/po/cs.po
	client/po/da.po
	client/po/de.po
	client/po/entropy.pot
	client/po/es.po
	client/po/es_CL.po
	client/po/fr.po
	client/po/fr_CA.po
	client/po/it.po
	client/po/nl.po
	client/po/pl.po
	client/po/pt.po
	client/po/pt_BR.po
	client/po/ru.po
	client/po/sk.po
	client/po/sv.po
	client/po/uk.po
	client/po/zh_TW.po
	client/revision
	docs/ChangeLog
	docs/TODO
	lib/entropy/cache.py
	lib/entropy/client/interfaces/db.py
	lib/entropy/const.py
	lib/entropy/revision
	lib/entropy/spm/plugins/interfaces/portage_plugin/__init__.py
	server/revision
2012-11-06 22:35:01 +01:00
..