summaryrefslogtreecommitdiff
path: root/BitmapEncoder-master/.gitattributes
diff options
context:
space:
mode:
authorXaviDCR92 <xavi.dcr@gmail.com>2017-11-05 04:16:32 +0100
committerXaviDCR92 <xavi.dcr@gmail.com>2017-11-05 04:16:32 +0100
commit2cf2d608af862e812e7fd3ac580f869141a96fa7 (patch)
tree29a356a46635e4bc14e9e7342eb5a41defcab899 /BitmapEncoder-master/.gitattributes
parentb764612a79100271270012053bdb1e4302cd93b7 (diff)
downloadpocketempires-2cf2d608af862e812e7fd3ac580f869141a96fa7.tar.gz
+ Added copy of BitmapEncoder
+ New sprite and unit "Town center" * Provisional collision checking. * Many other modifications.
Diffstat (limited to 'BitmapEncoder-master/.gitattributes')
-rw-r--r--BitmapEncoder-master/.gitattributes23
1 files changed, 23 insertions, 0 deletions
diff --git a/BitmapEncoder-master/.gitattributes b/BitmapEncoder-master/.gitattributes
new file mode 100644
index 0000000..32fdc60
--- /dev/null
+++ b/BitmapEncoder-master/.gitattributes
@@ -0,0 +1,23 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+*.jar binary
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain