fix merge conflicts
[sface.git] / .gitignore
2010-09-09 Barış Metinintroduce sfahelper