summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| * | 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 problem...David Sunderland2018-04-191-1/+1
| * | Mark new GetWithoutMatchers method as part of the exported API, to address MS...David Sunderland2018-04-192-2/+2
| * | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest in...David Sunderland2018-04-185-270/+438
| |\ \
| | * \ Merge branch 'master' into parameterlessdnsunderland2018-04-185-270/+438
| | |\ \
| * | | | Don't use generalized initializer list; is C++11 extension.David Sunderland2018-04-181-1/+1
| |/ / /
| * | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-187-13/+426
* | | | merging, Gennadiy Civil2018-04-258-493/+929
| |_|/ |/| |
* | | reverting, testrefs/pull/1580/headGennadiy Civil2018-04-191-13/+3
* | | reverting just to test Gennadiy Civil2018-04-191-1/+1
* | | testingGennadiy Civil2018-04-191-12/+12
* | | more typosGennadiy Civil2018-04-181-1/+1
* | | msvcGennadiy Civil2018-04-181-8/+6
* | | more typosGennadiy Civil2018-04-181-3/+2
* | | typoGennadiy Civil2018-04-181-7/+7
* | | move only types docsGennadiy Civil2018-04-181-112/+93
* | | typoGennadiy Civil2018-04-181-0/+4
* | | typoGennadiy Civil2018-04-181-1/+1
* | | http://cl/193386206Gennadiy Civil2018-04-181-0/+9
generated by cgit v0.12 at 2024-11-07 09:38:49 (GMT)