diff options
author | Antony Woods <acron1@gmail.com> | 2013-10-30 08:38:58 +0000 |
---|---|---|
committer | Antony Woods <acron1@gmail.com> | 2013-10-30 08:38:58 +0000 |
commit | 592f570433a87cee508e30457af58dde4121e705 (patch) | |
tree | 8f5fdbe7dcb169ea54d1123d97b952de502c5733 /.gitattributes | |
parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) |
Resolved README merge conflict
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1149409 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +* text=auto +*.cc text +*.h text +*.txt text +CMake* text +*.cmake text +*.md text +*.in text +Doxyfile text +Makefile text |