aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #713 from DarthGandalf/expectBilly Donahue2016-02-177-293/+290
|\ | | | | Change error message of EXPECT_EQ to treat lhs and rhs equivalently.
| * Change error message of EXPECT_EQ to treat lhs and rhs equivalently.Alexey Sokolov2016-02-167-293/+290
| |
* | Merge pull request #715 from jacob-meacham/bugfix/expect-callBilly Donahue2016-02-163-8/+8
|\ \ | | | | | | Fix link that's returned when running tests. #714
| * | Fix link that's returned when running tests. #714Jacob Meacham2016-02-163-8/+8
| |/
* | Merge pull request #716 from jacob-meacham/feature/gitignoreBilly Donahue2016-02-162-0/+4
|\ \ | |/ |/| Add build artifacts to git ignore.
| * Add build artifacts to git ignore.Jacob Meacham2016-02-162-0/+4
|/
* Merge pull request #688 from tamland/python3Billy Donahue2016-02-019-29/+36
|\ | | | | Python 3 support
| * add python 3 support to fuse_gtest_files scriptThomas Amland2016-01-191-15/+18
| |
| * add python 3 support to testsThomas Amland2016-01-198-14/+18
| |
* | Merge pull request #699 from achimnol/masterBilly Donahue2016-01-312-0/+8
|\ \ | | | | | | Add tmux and tmux-256color to the colored terminal list.
| * | Add tmux and tmux-256color to the colored terminal list.Joongi Kim2016-01-312-0/+8
|/ /
* | Merge pull request #678 from pjaytycy/masterBilly Donahue2016-01-211-0/+3
|\ \ | |/ |/| Add link to Google Test Primer docs in README.md
| * Add link to Google Test Primer docs in README.mdPieter-Jan Busschaert2016-01-061-0/+3
|/ | | On google code, the main documentation pages were the "Google Test Primer" content. Currently it's hard to find that content on github, so add a direct link in the main README.md.
* Merge pull request #670 from dawikur/masterBilly Donahue2015-12-231-1/+1
|\ | | | | Update GTEST_PROJECT_URL_ in internal/gtest-port.h
| * Update GTEST_PROJECT_URL_ in internal/gtest-port.hDawid Kurek2015-12-231-1/+1
|/ | | | As repository moved to github. All urls need to be changed. There is still plenty to do.
* Merge pull request #602 from mtbrandy/threadcount_aixBilly Donahue2015-12-101-0/+18
|\ | | | | Implement GetThreadCount for AIX.
| * Add include of sys/types.h.Matthew Brandyberry2015-10-021-0/+1
| |
| * Implement GetThreadCount for AIX.Matthew Brandyberry2015-10-021-0/+17
| |
* | Merge pull request #657 from audiofanatic/issue655-targetHeaderDepsBilly Donahue2015-12-102-0/+16
|\ \ | | | | | | Add include dirs to targets if CMake version supports it
| * | Add include dirs to targets if CMake version supports itCraig Scott2015-12-062-0/+16
| | |
* | | Merge pull request #650 from jpuigcerver/masterBilly Donahue2015-12-101-0/+8
|\ \ \ | | | | | | | | Added missing CMake install rules for GMock
| * | | Added CMake install rules for GMockJoan Puigcerver2015-12-031-0/+8
| | | |
* | | | Merge pull request #660 from waynix/FixLinksBilly Donahue2015-12-086-42/+42
|\ \ \ \ | |_|/ / |/| | | fixed link in googlemock documentation
| * | | fixed link in googlemock documentationPaul Rosset2015-12-086-42/+42
|/ / /
* | | Merge pull request #654 from cmorse/doc_fixBilly Donahue2015-12-0416-159/+162
|\ \ \ | |/ / |/| | Fix lots of broken links in documentation
| * | Fix link to FAQ in Primer.mdCaleb Morse2015-12-0316-159/+162
|/ /
* | Merge pull request #647 from mithro/patch-1Billy Donahue2015-12-021-1/+1
|\ \ | | | | | | Fix AdvancedGuide link in FAQ.md
| * | Fix AdvancedGuide link in FAQ.mdTim Ansell2015-12-021-1/+1
|/ /
* | Merge pull request #636 from ReadmeCritic/masterBilly Donahue2015-11-301-4/+4
|\ \ | | | | | | Update README URLs based on HTTP redirects
| * | Update README URLs based on HTTP redirectsReadmeCritic2015-11-251-4/+4
| | |
* | | Merge pull request #607 from google/BillyDonahue-patch-1Billy Donahue2015-11-301-25/+12
|\ \ \ | | | | | | | | Update DevGuide.md
| * | | Update DevGuide.mdBilly Donahue2015-10-081-25/+12
| | | | | | | | | | | | stop talking about subversion in the devguide.
* | | | Merge pull request #640 from Ali-Se/patch-2Billy Donahue2015-11-301-4/+4
|\ \ \ \ | | | | | | | | | | Fixing some table error in file
| * | | | Fixing some table error in fileAli Sa'ad Eddeen2015-11-291-4/+4
| | |/ / | |/| | | | | | Some tables have missing commas inside the code that make some table cells merge, added missing commas
* | | | Merge pull request #638 from KindDragon/patch-1Billy Donahue2015-11-301-50/+50
|\ \ \ \ | | | | | | | | | | Update FAQ.md
| * | | | Update FAQ.mdArkady Shapkin2015-11-281-50/+50
| |/ / /
* | | | Merge pull request #592 from Ferenc-/masterBilly Donahue2015-11-301-1/+1
|\ \ \ \ | |/ / / |/| | | Fix typo in googlemock/README.md
| * | | Fix typo in googlemock/README.mdFerenc-2015-09-191-1/+1
| | | |
* | | | Merge pull request #633 from plopresti/masterBilly Donahue2015-11-241-6/+1
|\ \ \ \ | | | | | | | | | | Fix missing-field-initializers GCC/Clang warning (issue 433).
| * | | | Fix missing-field-initializers GCC/Clang warning (issue 433).Patrick J. LoPresti2015-11-241-6/+1
|/ / / /
* | | | Merge pull request #632 from nocnokneo/add-cmake-install-rulesBilly Donahue2015-11-241-0/+8
|\ \ \ \ | | | | | | | | | | Add CMake install rules for gtest libraries and headers
| * | | | Add CMake install rules for gtest libraries and headersTaylor Braun-Jones2015-11-231-0/+8
| | | | |
* | | | | Merge pull request #628 from fjunqueira/patch-1Billy Donahue2015-11-241-0/+16
|\ \ \ \ \ | | | | | | | | | | | | Adding CMakeLists.txt to the root dir
| * | | | | Create CMakeLists.txtFábio Junqueira2015-11-111-0/+16
| | | | | | | | | | | | | | | | | | Adding functionality to build googletest from the root directory
* | | | | | Merge pull request #614 from DukeXar/masterBilly Donahue2015-11-241-9/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix C++11 clang builds in Travis CI
| * | | | | Override clang++ name on Linux onlyAnton Klautsan2015-10-181-1/+1
| | | | | |
| * | | | | More docs in travis configAnton Klautsan2015-10-181-0/+4
| | | | | |
| * | | | | Update clang versionAnton Klautsan2015-10-181-7/+4
| | | | | |
| * | | | | Adding llvm toolchain repoAnton Klautsan2015-10-181-17/+6
| | | | | |
| * | | | | Update .travis.ymlAnton Klautsan2015-10-181-4/+8
| | | | | |