diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2013-05-10 21:13:10 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2013-05-10 21:13:10 -0300 |
| commit | 52a58b5a82cea7210efffc88f14706973bb1dfa3 (patch) | |
| tree | 093619b18b8288cbd419b8e1258b7b70f0bd4e01 /.gitattributes | |
| parent | fa24fdb97db2aca73d94bb584835e9e864c8d085 (diff) | |
| download | hercules-52a58b5a82cea7210efffc88f14706973bb1dfa3.tar.gz hercules-52a58b5a82cea7210efffc88f14706973bb1dfa3.tar.bz2 hercules-52a58b5a82cea7210efffc88f14706973bb1dfa3.tar.xz hercules-52a58b5a82cea7210efffc88f14706973bb1dfa3.zip | |
* Implemented suggestion in topic:528, related to GMs being able to warp to non-walkable cells; also added configuration.
* Few changes to gitignore and gitattributes.
Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.gitattributes b/.gitattributes index 3820cfc1d..a839a28c9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,5 @@ -# Auto detect text files and perform LF normalization * text=auto *.c diff=cpp -# Custom for Visual Studio -*.cs diff=csharp *.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union
\ No newline at end of file +*.vcproj merge=union +*.vcxproj merge=union
\ No newline at end of file |