summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest...Chris2019-01-0474-2815/+2280
|\
| * Merge branch 'master' into chore/fix_library_jsonChris Johnson2019-01-0474-2815/+2280
| |\
| | * Merge pull request #2042 from gennadiycivil/masterGennadiy Civil2019-01-043-108/+106
| | |\
| | | * Merge branch 'master' of https://github.com/google/googletestrefs/pull/2042/headGennadiy Civil2019-01-0322-1119/+1502
| | | |\ | | | |/ | | |/|
| | * | Googletest exportmisterg2019-01-033-38/+48
| | * | Googletest exportmisterg2019-01-0320-1081/+1454
| | | * Update docs, TestCase->TestSuiteGennadiy Civil2019-01-033-108/+106
| | |/
| | * Update README.mdGennadiy Civil2019-01-031-2/+2
| | * Update README.mdGennadiy Civil2019-01-031-1/+1
| | * Update README.mdGennadiy Civil2019-01-031-0/+4
| | * Merge pull request #2026 from justin6case/example_makefile_improvementsGennadiy Civil2019-01-032-13/+35
| | |\
| | | * Improvements have been made to the example/sample makefiles for both googlemockrefs/pull/2026/headCase, Matt2018-12-212-13/+35
| | * | Merge pull request #2037 from ciband:chore/fix_library_jsonGennadiy Civil2019-01-037-33/+1755
| | |\ \
| | * | | Googletest exportmisterg2019-01-0229-108/+1
| | * | | Googletest exportAbseil Team2019-01-0225-345/+67
| | * | | Merge pull request #2039 from gennadiycivil/masterGennadiy Civil2019-01-024-1706/+0
| | |\ \ \
| | | * | | Remove outdated scriptsrefs/pull/2039/headGennadiy Civil2019-01-024-1706/+0
| | | * | | Revert "test, please ignore"Gennadiy Civil2019-01-021-1/+0
| | | * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2019-01-02143-14463/+6941
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #2035 from syohex/update-xcode-project-fileGennadiy Civil2018-12-281-12/+0
| | |\ \ \ \
| | | * | | | Update Xcode project filerefs/pull/2035/headSyohei YOSHIDA2018-12-281-12/+0
| | |/ / / /
| | * | | | Merge #2002Ryohei Machida2018-12-272-22/+15
| | * | | | Update README.mdGennadiy Civil2018-12-271-1/+1
| | * | | | Merge pull request #2027 from ciband:chore/fix_library_jsonGennadiy Civil2018-12-272-3/+3
| | |\ \ \ \
| | * | | | | Update README.mdGennadiy Civil2018-12-211-1/+1
| | * | | | | Merge pull request #2013 from ciband:chore/fix_library_jsonGennadiy Civil2018-12-213-2/+59
| | |\ \ \ \ \
| | * | | | | | Googletest exportAbseil Team2018-12-215-169/+6
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Googletest exportAbseil Team2018-12-204-5/+249
| | * | | | | Googletest exportAbseil Team2018-12-201-56/+20
| | * | | | | Googletest exportAbseil Team2018-12-2017-654/+30
| | * | | | | Googletest exportmisterg2018-12-171-4/+0
| | * | | | | Googletest exportmisterg2018-12-171-0/+2
| | * | | | | Update README.mdGennadiy Civil2018-12-171-1/+1
| | * | | | | Googletest exportmisterg2018-12-171-0/+7
| | * | | | | Googletest exportAbseil Team2018-12-172-46/+28
| | * | | | | Googletest exportAbseil Team2018-12-172-16/+121
| | * | | | | Googletest exportAbseil Team2018-12-173-165/+40
| | | | | * | test, please ignoreGennadiy Civil2018-10-091-0/+1
* | | | | | | chore: Add Windows cmake files to .gitignoreChris2019-01-041-0/+26
* | | | | | | chore: Alphabetize exclude directories.Chris2019-01-041-3/+3
|/ / / / / /
* | | | | | fix: Correct *_main.cc pathsChris2019-01-031-2/+2
* | | | | | fix: Remove Arduino entry pointsChris2019-01-035-228/+188
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest...refs/pull/2037/headChris2018-12-290-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fix: Correct GitHub pathsrefs/pull/2027/headChris Johnson2018-12-211-2/+2
| | |/ / | |/| |
* | | | fix: Add additional source and include directories.Chris2018-12-291-34/+38
|/ / /
* | | chore: Add .vs to .gitignore for Visual Studiorefs/pull/2013/headChris2018-12-151-0/+1
* | | fix: correct JSON syntaxChris2018-12-151-1/+1
|/ /
* | Merge pull request #2000 from ciband:feat/add_support_platformioGennadiy Civil2018-12-148-18/+134
|\ \
| * | chore: Update version to latest releaseChris Johnson2018-12-071-1/+1
| * | fix: Remove global chmod from TravisChris Johnson2018-12-061-3/+1