Merge branch 'merges'
[sxemacs] / .gitignore
2010-11-04 Steve YoungsUpdate the .gitignore to cater for in-tree builds
2010-11-04 Steve YoungsConvert the tla-generated versioning info to git-generated