Merge branch 'develop'
[archipelago] / .gitignore
1 xseg/tools/archipelago/archipelago/version.py
2 xseg/sys/user/python/xseg/version.py