Merge branch 'maint'
[platform/upstream/automake.git] / .gitattributes
2012-02-14 Stefano LattariniMerge branch 'maint'
2012-02-14 Stefano Lattarinigitattributes: custom merge driver for ChangeLog not...
2012-02-14 Stefano Lattarinigitattributes: use "union" merge driver for NEWS
2011-01-15 Ralf WildenhuesMerge branch 'sanity-sleep-fix-master'
2011-01-15 Ralf WildenhuesMerge branch 'sanity-sleep-fix-master'
2010-11-14 Ralf WildenhuesMerge branch 'sanity-sleep-fix-master'
2010-10-02 Ralf WildenhuesMerge branch 'sanity-sleep-fix-master'
2009-09-18 Ralf WildenhuesMerge branch 'maint'
2009-09-18 Ralf WildenhuesUpdate git attributes for texinfo files.
2008-06-16 Ralf Wildenhuesgit metadata update.