Commit Graph

4 Commits

Author SHA1 Message Date
Julian Amann
0aef06a2d0 Add .gitattributes to have uniform line endings 2022-04-24 22:28:44 +02:00
vitaut
3242e624d5 Update branch name and remove .gitattributes 2015-10-19 08:01:18 -07:00
vitaut
a43e242716 ours -> keep-ours 2015-10-18 10:24:54 -07:00
vitaut
1e8496da4a Keep our .travis.yml during merge
because it contains Coverity Scan configuration.
2015-07-31 09:38:08 -07:00