summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1837 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-142-23/+30
|\
| * Googletest exportAbseil Team2018-09-142-23/+30
* | Update README.mdGennadiy Civil2018-09-131-29/+0
|/
* Fix gcc misleading indentation again.Romain Geissler2018-09-102-12/+24
* Fix doc linksArkady Shapkin2018-09-046-23/+22
* Merge branch 'master' into fix-gmock-pkgconfigGennadiy Civil2018-09-045-316/+342
|\
| * Update documentation to syntax highlight codeArkady Shapkin2018-09-035-316/+342
* | pkgconfig: Unconditionally depend on GTest when using GMockDavid Seifert2018-09-022-0/+2
|/
* Googletest exportmisterg2018-08-301-3/+5
* Googletest exportmisterg2018-08-301-4/+3
* Update gmock-matchers.hGennadiy Civil2018-08-291-3/+4
* Googletest exportAbseil Team2018-08-282-3/+4
* Merge branch 'master' into fix-1764_CMake-errors-in-googlemockGennadiy Civil2018-08-272-34/+53
|\
| * No longer require a functor passed to ResultOf matcher to define `result_of` ...Abseil Team2018-08-272-34/+53
* | Use `$<INSTALL_PREFIX>` in `target_include_directories`Dakota Hawkins2018-08-241-2/+2
|/
* Fix #1764 Remove cmake code that leads to a configuration errorWill Vining2018-08-241-21/+0
* Install CMake export filesStefano Soffia2018-08-221-65/+19
* Improve CMake exported targets.Dakota Hawkins2018-08-211-6/+33
* Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-204-12/+31
|\
| * googletest exportmisterg2018-08-203-8/+17
| * Merge branch 'master' into cleanup-cmakeHenry Schreiner2018-08-171-3/+3
| |\
| * \ Merge branch 'master' into cleanup-cmakeGennadiy Civil2018-08-1563-1557/+2600
| |\ \
| * \ \ Merge branch 'master' into cleanup-cmakeHenry Schreiner2018-04-0611-457/+1361
| |\ \ \
| * | | | Clean up cache non-advanced variable for subprojectHenry Fredrick Schreiner2018-04-051-4/+14
* | | | | Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-1669-2184/+5391
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | googletest exportAbseil Team2018-08-151-3/+3
| | |_|/ | |/| |
| * | | 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 gmock/...Elias Daler2018-08-131-3/+3
| |/ / /
| * | | 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
| * | | 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
| |\ \ \
OpenPOWER on IntegriCloud