aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into hethi/remove-old-docsHerbert Thielen2017-08-0927-44/+87
|\
| * Merge pull request #1123 from chromy/upstream-141765019Gennadiy Civil2017-08-081-4/+4
| |\ | | | | | | Fix typo in gmock-actions.h
| | * Fix typo in gmock-actions.hHector Dearman2017-06-191-4/+4
| | | | | | | | | | | | This upstreams a Google-internal change (141765019).
| * | Merge pull request #1122 from chromy/upstream-146491438Gennadiy Civil2017-08-081-1/+1
| |\ \ | | | | | | | | Fixed misspelling in assertion message.
| | * | Fixed misspelling in assertion message.Hector Dearman2017-06-191-1/+1
| | |/ | | | | | | | | | This upstreams a Google-internal change (146491438).
| * | Merge pull request #925 from edgarriba/patch-1Gennadiy Civil2017-08-081-0/+1
| |\ \ | | | | | | | | update README.md with tiny-dnn
| | * | update README.md with tiny-dnnEdgar Riba2016-11-051-0/+1
| | | | | | | | | | | | | | | | tiny-dnn in its recent version updated the testing framework to GTest. We would like to be mentioned as consumers of the project.
| * | | Merge pull request #675 from theHacker/masterGennadiy Civil2017-08-081-0/+1
| |\ \ \ | | | | | | | | | | Fix: Markdown in V1_7_Primer.md
| | * | | Fix: Markdown in V1_7_Primer.mdAlexander Münch2016-01-021-0/+1
| | | | | | | | | | | | | | | table "Basic Assertions" is now rendered correctly as table
| * | | | Merge pull request #1173 from shlomif/correct-typoGennadiy Civil2017-08-071-1/+1
| |\ \ \ \ | | | | | | | | | | | | Correct some typos in a comment
| | * | | | Correct some typos in a commentShlomi Fish2017-08-041-1/+1
| | | | | |
| * | | | | Merge pull request #909 from AsturaPhoenix/patch-1Gennadiy Civil2017-08-071-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Update Primer.md
| | * | | | | Update Primer.mdRoss Wang2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | Correcting typo: "text fixture" => "test fixture"
| * | | | | | Merge pull request #1180 from aconverse/masterGennadiy Civil2017-08-071-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Use wider types to prevent unsigned overflow diagnostics
| | * | | | | | Use wider types to prevent unsigned overflow diagnosticsAlex Converse2017-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the (covered) codebase is already integer overflow clean. This is a cherry-pick of an internal change. TESTED=gtest_shuffle_test goes from fail to pass with -fsanitize=integer
| * | | | | | | Merge pull request #1176 from aninf-wo/hethi/typoGennadiy Civil2017-08-071-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | fix small typo in comment
| | * | | | | | fix small typo in commentHerbert Thielen2017-08-051-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #1030 from vpfautz/masterGennadiy Civil2017-08-0310-11/+11
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fixed some typos
| | * | | | | Fixed some typosvpfautz2017-02-2610-11/+11
| | | | | | |
| * | | | | | Merge pull request #1172 from joelypoley/joelypoley-patch-1Gennadiy Civil2017-08-031-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix cmake policy issue
| | * | | | | | Fixed cmake policy issueJoel Laity2017-08-031-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #1042 from danilcha/patch-1Gennadiy Civil2017-08-021-3/+36
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added description of how to silence clang pedantic warnings in Google Mock includes
| | * | | | | | Again rewrote everythingdanilcha2017-03-121-12/+24
| | | | | | | |
| | * | | | | | Added explicit gtest library dependencydanilcha2017-03-121-1/+1
| | | | | | | |
| | * | | | | | Update README.mddanilcha2017-03-111-2/+2
| | | | | | | |
| | * | | | | | Update README.mddanilcha2017-03-111-3/+24
| | |/ / / / /
| * | | | | | Merge pull request #1170 from Manozco/1169_fix_old_cmake_issueGennadiy Civil2017-08-021-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix policy issue with old cmakes
| | * | | | | | Fix policy issue with old cmakesManuel VIVES2017-08-021-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | #1169
| * | | | | | Merge pull request #867 from marzojr/patch-1Gennadiy Civil2017-08-021-2/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Clarifying documentation language
| | * | | | | | Clarifying languageMarzo Sette Torres Junior2016-09-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | The old language might mislead someone into thinking that the access level on the base class itself was changed.
| * | | | | | | Merge pull request #671 from mehagar/patch-1Gennadiy Civil2017-08-021-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix typo in AdvancedGuide.md
| | * | | | | | | Fix typo in AdvancedGuide.mdmehagar2015-12-291-1/+1
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #782 from Manozco/709-cmake-policy-project-versionGennadiy Civil2017-08-021-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Issue 709: Fix Cmake policy 0048
| | * | | | | | | Issue 709: Fix Cmake policy 0048Manuel Vives2016-05-211-0/+1
| | | | | | | | |
| * | | | | | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-0212-12/+12
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove duplicated words
| | * | | | | | | | remove duplicated wordsLi Peng2016-04-2712-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Li Peng <lip@dtdream.com>
| * | | | | | | | | Merge pull request #962 from klimkin/klimkin-patch-typoGennadiy Civil2017-08-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix a typo
| | * | | | | | | | | Fix a typoAlexey Klimkin2016-12-121-1/+1
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | Help says "FILE_PATH defaults to test_details.xml", but the real path is test_detail.xml.
| * | | | | | | | | Merge pull request #998 from dawikur/patch-1Gennadiy Civil2017-08-021-2/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Replace html entities with their equivalents
| | * | | | | | | | | Replace html entities with their equivalentsDawid Kurek2017-02-061-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #968 from nicolacavallini/link_typed_test_docsGennadiy Civil2017-08-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | added link to sample 6 in the documentation of typed test
| | * | | | | | | | | | added link to sample 6 in the documentation of typed testnicolacavallini2016-12-231-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1147 from pbos/gtest_parallel_linkGennadiy Civil2017-08-011-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add gtest-parallel to open-source projects.
| | * | | | | | | | | | | Add gtest-parallel to open-source projects.Peter Boström2017-07-111-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1167 from krizalys/fix-typoGennadiy Civil2017-07-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo
| | * | | | | | | | | | | | Fixed typoChristophe Vidal2017-07-311-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1165 from aninf-wo/hethi/fix-doc-linksGennadiy Civil2017-07-313-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | fix links to Google C++ Style Guide
| | * | | | | | | | | | | | fix links to Google C++ Style GuideHerbert Thielen2017-07-303-4/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | remove doc of former versionsHerbert Thielen2017-07-3015-14880/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of former versions is available in the history (e.g. by checking out the appropriate git tags), so there is no need to keep them in parallel to the current documentation.
* | | | | | | | | | | | | remove obsolete reference to SVN trunk and fix link to pump manualHerbert Thielen2017-07-301-3/+6
| | | | | | | | | | | | |