diff options
| author | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
|---|---|---|
| committer | Ferran Pujol Camins <ferranpujolcamins@gmail.com> | 2020-01-19 20:14:50 +0100 |
| commit | 9cdf435dac257e7e4a0598bac9491025b5605e64 (patch) | |
| tree | 1438f7442281478154217c39dab08a935839c7ac /lib/googletest-1.8.x/.gitignore | |
| parent | a17bdf8dc89763c74aadc794ac8574da11dc1d99 (diff) | |
| parent | 9839b45e764e5222054280190b6fe835522e2949 (diff) | |
Merge branch 'master' into migrate-to-QJSEngine
# Conflicts:
# build/depends.py
# src/controllers/hid/hidcontroller.cpp
# src/controllers/hid/hidcontroller.h
Diffstat (limited to 'lib/googletest-1.8.x/.gitignore')
| -rw-r--r-- | lib/googletest-1.8.x/.gitignore | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/lib/googletest-1.8.x/.gitignore b/lib/googletest-1.8.x/.gitignore new file mode 100644 index 0000000000..73cdd2c203 --- /dev/null +++ b/lib/googletest-1.8.x/.gitignore @@ -0,0 +1,54 @@ +# Ignore CI build directory +build/ +xcuserdata +cmake-build-debug/ +.idea/ +bazel-bin +bazel-genfiles +bazel-googletest +bazel-out +bazel-testlogs +# python +*.pyc + +# Visual Studio files +*.sdf +*.opensdf +*.VC.opendb +*.suo +*.user +_ReSharper.Caches/ +Win32-Debug/ +Win32-Release/ +x64-Debug/ +x64-Release/ + +# Ignore autoconf / automake files +Makefile.in +aclocal.m4 +configure +build-aux/ +autom4te.cache/ +googletest/m4/libtool.m4 +googletest/m4/ltoptions.m4 +googletest/m4/ltsugar.m4 +googletest/m4/ltversion.m4 +googletest/m4/lt~obsolete.m4 + +# Ignore generated directories. +googlemock/fused-src/ +googletest/fused-src/ + +# macOS files +.DS_Store + +# Ignore cmake generated directories and files. +CMakeFiles +CTestTestfile.cmake +Makefile +cmake_install.cmake +googlemock/CMakeFiles +googlemock/CTestTestfile.cmake +googlemock/Makefile +googlemock/cmake_install.cmake +googlemock/gtest |