ENGINE-883: syncing changes up with Release_2.1

2 years ago · 75ee90ffb6
parent 0abde28775
commit 75ee90ffb6
2 changed files with 3 additions and 5 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +0,0 @@
-commit_hash.h filter=commit_hash
--- a/.gitignore
+++ b/.gitignore
@ -31,6 +31,7 @@ build-android/pEpEngine-android-1.zip
 build-android/third-party
 build-android/pEpEngine-android-1
 build-linux/*
+build-windows/libpEpasn1/libpEpasn1.vcxproj.user
 *.dSYM*
 *_test
 msg4.asc
@ -86,10 +87,8 @@ lldb-history
 test/EngineTests
 test/googletest
 test/tmp/*
-.idea/
-pEpMIME/*.hh
-pEpMIME/*.cc
-pEpMIME/*.hxx
+
+src/commit_hash.h

 # ignore generated test data