From b3b7202b99b5cbc89565b4581461b9d27b8009f3 Mon Sep 17 00:00:00 2001 From: Jean-Philip Desjardins Date: Mon, 9 Mar 2015 23:00:30 -0400 Subject: [PATCH] Updated git settings for Android build. --- .gitattributes | 1 + .gitignore | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..e4497b123 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh eol=lf diff --git a/.gitignore b/.gitignore index ad5ce7971..9a869c27c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,17 @@ -*.sdf +build_android/bin +build_android/gen +build_android/libs +build_android/obj Debug Release ReleaseWithDebugger DebugAot ReleaseAot -*.ipch -*.userprops -*.suo *.aps +*.ipch +*.sdf +*.suo *.user +*.userprops xcuserdata