diff options
| author | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
|---|---|---|
| committer | shennetsind <notind@gmail.com> | 2013-05-17 11:08:38 -0700 |
| commit | 080f7a22740225df70a488849587b462a5d6b1a3 (patch) | |
| tree | 0c1dc751af9f06e1ce3729d271de301f78a4e611 /.gitattributes | |
| parent | 754af15505f32237f8063e51ae9a1cb90788dff4 (diff) | |
| parent | 25e848f1a0f9317d63106cae048a1ef838411cb2 (diff) | |
| download | hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.gz hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.bz2 hercules-080f7a22740225df70a488849587b462a5d6b1a3.tar.xz hercules-080f7a22740225df70a488849587b462a5d6b1a3.zip | |
Merge pull request #1 from Earisu/master
updating, with earisu's
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a839a28c9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +* text=auto +*.c diff=cpp +*.sln merge=union +*.vcproj merge=union +*.vcxproj merge=union
\ No newline at end of file |