Merge branch 'simple-dirs' of https://github.com/ochameau/addon-sdk i… · mozilla/addon-sdk@062918d · GitHub

This repository has been archived by the owner on Feb 26, 2022. It is now read-only.

Commit

Merge branch 'simple-dirs' of https://github.com/ochameau/addon-sdk i…

Browse files

…nto simple-dirs

Conflicts:
	python-lib/cuddlefish/__init__.py

Loading branch information

ochameau committed Nov 29, 2011

2 parents e5eeebf + 4fb1235 commit 062918d