aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-1410-17/+11
|\
| * more comments changesGennadiy 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 changesGennadiy Civil2018-08-1444-88/+44
| |
| * Code formatting changes, clean up, no functionality changesGennadiy Civil2018-08-142-12/+6
| |
| * formatting custom/README.mdGennadiy Civil2018-08-131-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 ↵Elias Daler2018-08-131-3/+3
|/ | | | gmock/gtest_BINARY_DIR (#1717)
* comment cleanupGennadiy Civil2018-08-131-2/+0
|
* Update gmock_output_test.pyGennadiy Civil2018-08-091-1/+1
|
* Formatting change for auto code management, no functionality changesGennadiy Civil2018-08-091-1/+2
| | | | Merge branch 'master' of https://github.com/google/googletest
* Formatting changes,small cleanup, no functionality changesGennadiy Civil2018-08-071-1/+2
|
* small cleanup, np functional changesGennadiy Civil2018-08-071-2/+0
|
* automatic code sync mgt, comment onlyGennadiy Civil2018-08-061-0/+2
|
* Merge branch 'master' into masterGennadiy Civil2018-08-014-7/+7
|\
| * Merge branch 'master' into masterGennadiy 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 syncGennadiy Civil2018-07-251-2/+1
|
* Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-215-28/+67
|\
| * code mergeGennadiy Civil2018-07-202-1/+18
| |
| * Merge branch 'master' into googletest_for_asamduxiuxing2018-07-202-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-202-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 ↵duxiuxing2018-07-173-21/+21
| | | | | | | | | | | | in the current code page (936). Save the file in Unicode format to prevent data loss
* | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-193-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-181-3/+2
|\|
| * Put ifdef guard after the includes.Adrian Moran2018-07-131-1/+1
| | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
| * Avoid full test in no exceptions are enabled.Adrian Moran2018-07-121-5/+2
| | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
| * Fix issue #1654.Adrian Moran2018-07-111-0/+2
| | | | | | | | Signed-off-by: Adrian Moran <amoran@ikerlan.es>
* | This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.Masaru Tsuchiyama2018-06-302-8/+8
|/ | | | | | | | non-ASCII charactors are interpreted as Shift-JIS on the environment. But the charators in the files are non Shift-JIS charactors and the compiler stops compiling with C4819. To fix the errors, remove non-ASCII charactors.
* Removed "Documentation.md" not adding value and not consitent with internal docsGennadiy Civil2018-06-111-1/+0
|
* Rename AdvancedGuide.md to advanced.md and adjust the links. Gennadiy Civil2018-06-113-3/+3
| | | Part of documentation rationalization work
* Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion ↵Gennadiy Civil2018-06-112-9/+9
| | | | rationalzation
* formatting changes Gennadiy Civil2018-05-232-6/+5
|
* Formatting changes Gennadiy Civil2018-05-232-2/+2
|
* Fix gmock not building when -fno-rttiScott Graham2018-05-022-8/+6
| | | | Fixes issue #1554. This is internal cl/195020996.
* mergedGennadiy Civil2018-04-251-1/+0
|\
| * Merge branch 'master' into parameterlessGennadiy Civil2018-04-191-112/+93
| |\
| * | Fix friend declaration to use GTEST_API_ decl spec.David Sunderland2018-04-191-1/+1
| | |
| * | Revert useless use of GTEST_API_ on WithoutMatchers decl.David Sunderland2018-04-191-1/+1
| | |
| * | Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the ↵David Sunderland2018-04-181-1/+1
| | | | | | | | | | | | problem on MSVC?
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-05 20:11:33 +0000