Merge branch 'master' into authentication
[lyrix.git] / .gitignore
blob0ddd5afebc2dd1a669e3749dd29a5577b48ba9c8
1 .svn
2 .DS_Store
3 ._*
4 *~
5 tmp