summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into cleanup-cmakerefs/pull/1546/headHenry Schreiner2018-08-171-3/+3
|\
| * googletest exportrefs/pull/1746/headAbseil Team2018-08-151-3/+3
* | Merge branch 'master' into cleanup-cmakeGennadiy Civil2018-08-1563-1557/+2600
|\ \ | |/
| * Merge branch 'master' into cmake-binary-dir-fixrefs/pull/1734/headGennadiy Civil2018-08-1410-17/+11
| |\
| | * more comments changesrefs/pull/1741/headGennadiy Civil2018-08-141-1/+1
| | * more comments changesGennadiy Civil2018-08-142-2/+2
| | * Comments changes, no functionality changes. Gennadiy Civil2018-08-148-14/+8
| * | Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-1447-113/+68
| |\ \ | | |/
| | * Comments changes, no functionality changesrefs/pull/1740/headGennadiy Civil2018-08-1444-88/+44
| | * Code formatting changes, clean up, no functionality changesrefs/pull/1738/headGennadiy Civil2018-08-142-12/+6
| | * formatting custom/README.mdGennadiy Civil2018-08-141-1/+1
| | * formatting for new READMEsGennadiy Civil2018-08-131-6/+6
| | * Move instructions into custom/README filesGennadiy Civil2018-08-133-13/+18
| * | Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/...Elias Daler2018-08-131-3/+3
| |/
| * comment cleanuprefs/pull/1732/headGennadiy Civil2018-08-131-2/+0
| * Update gmock_output_test.pyrefs/pull/1725/headGennadiy Civil2018-08-091-1/+1
| * Formatting change for auto code management, no functionality changesGennadiy Civil2018-08-091-1/+2
| * Formatting changes,small cleanup, no functionality changesrefs/pull/1705/headGennadiy Civil2018-08-071-1/+2
| * small cleanup, np functional changesrefs/pull/1704/headGennadiy Civil2018-08-071-2/+0
| * automatic code sync mgt, comment onlyrefs/pull/1700/headGennadiy Civil2018-08-061-0/+2
| * Merge branch 'master' into masterrefs/pull/1695/headGennadiy Civil2018-08-014-7/+7
| |\
| | * Merge branch 'master' into masterrefs/pull/1685/headGennadiy Civil2018-07-3023-1/+47
| | |\
| | * | Updated broken and outdated URLsPiotr Kąkol2018-07-254-7/+7
| * | | Formatting changes and upstreaming one testGennadiy Civil2018-08-012-3/+0
| | |/ | |/|
| * | Formatting changes for automatic code managementGennadiy Civil2018-07-2723-1/+47
| |/
| * Formatting changes, code syncrefs/pull/1684/headGennadiy Civil2018-07-251-2/+1
| * Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-215-28/+67
| |\
| | * code mergerefs/pull/1676/headGennadiy Civil2018-07-202-1/+18
| | * Merge branch 'master' into googletest_for_asamrefs/pull/1668/headduxiuxing2018-07-192-7/+29
| | |\
| | | * code syncGennadiy Civil2018-07-192-4/+9
| | | * Code syncGennadiy Civil2018-07-181-3/+20
| | * | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio杜修杏2018-07-192-4/+4
| | * | Merge branch 'master' into googletest_for_asamduxiuxing2018-07-193-204/+3
| | |\ \ | | | |/
| | * | Fix warning C4819: The file contains a character that cannot be represented i...duxiuxing2018-07-173-21/+21
| * | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-183-204/+3
| |\ \ \ | | | |/ | | |/|
| | * | Code sync, mostly formatting and removing outdatesGennadiy Civil2018-07-182-203/+2
| | * | Formatting and a linkGennadiy Civil2018-07-181-1/+1
| | |/
| * | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-171-3/+2
| |\ \ | | |/
| | * Put ifdef guard after the includes.Adrian Moran2018-07-131-1/+1
| | * Avoid full test in no exceptions are enabled.Adrian Moran2018-07-121-5/+2
| | * Fix issue #1654.Adrian Moran2018-07-111-0/+2
| * | This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.Masaru Tsuchiyama2018-06-302-8/+8
| |/
| * Removed "Documentation.md" not adding value and not consitent with internal docsrefs/pull/1624/headGennadiy Civil2018-06-111-1/+0
| * Rename AdvancedGuide.md to advanced.md and adjust the links. Gennadiy Civil2018-06-113-3/+3
| * Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion ...Gennadiy Civil2018-06-112-9/+9
| * formatting changes refs/pull/1608/headGennadiy Civil2018-05-232-6/+5
| * Formatting changes refs/pull/1607/headGennadiy Civil2018-05-232-2/+2
| * Fix gmock not building when -fno-rttiScott Graham2018-05-022-8/+6
| * mergedrefs/pull/1588/headGennadiy Civil2018-04-251-1/+0
| |\
| | * Merge branch 'master' into parameterlessrefs/pull/1582/headGennadiy Civil2018-04-191-112/+93
| | |\