.project
*~
*.diff
*.patch
.DS_Store
cache/
combined/
combine/
