Commit Graph
596 Commits
Author SHA1 Message Date
Henry Schreiner a65a993a3c Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00
Gennadiy Civil b1bfdf0bf4 Small formatting change
And then we can merge
2018-08-16 15:10:07 -04:00
Gennadiy Civil 8c86040dd6 Merge branch 'master' into master 2018-08-16 13:37:53 -04:00
Gennadiy Civil c38f4b9f2c Small style changes.
Just small style changes and we can accept this PR
2018-08-16 13:18:13 -04:00
Gennadiy Civil f3a9fa6a62 Merge branch 'master' into master 2018-08-16 10:39:40 -04:00
Gennadiy Civil 1246e5807a Merge branch 'master' into cleanup-cmake 2018-08-15 13:02:54 -07:00
Gennadiy Civil 3c4f437c24 Merge branch 'master' into master 2018-08-15 11:33:15 -07:00
Gennadiy Civil 02671abb44 Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 14:25:05 -07:00
Gennadiy Civil f0e4c411ca more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil e26771776b Merge branch 'master' into cmake-binary-dir-fix 2018-08-14 12:55:13 -07:00
Gennadiy Civil bbf738a2c1 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil 265efde9a5 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil a3c0dd0f4d Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil 2421eff9f7 Merge branch 'master' into deprecate 2018-08-14 08:47:13 -07:00
Gennadiy Civil f225735222 Code formatting changes, clean up, no functionality changes 2018-08-14 11:08:35 -04:00
Gennadiy Civil caeaef302d Merge branch 'master' into master 2018-08-14 07:42:41 -07:00
tisi1988 87a37c60e3 Merge branch 'master' into master 2018-08-14 15:32:22 +02:00
Gennadiy Civil c203bee245 formatting custom/README.md 2018-08-13 22:45:53 -04:00
Gennadiy Civil 9060e19c87 formatting for new READMEs 2018-08-13 16:23:17 -04:00
Elias Daler 9ca399ae05 Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717) 2018-08-13 23:01:09 +03:00
Gennadiy Civil 47b57ff1b2 Merge branch 'master' into cross-testing-patch-1 2018-08-13 11:38:32 -07:00
Gennadiy Civil 63baab8924 Move instructions into custom/README files 2018-08-13 14:31:56 -04:00
Yi Zheng ecc241900a - Fix the broken markdown table
- Fix some format issue
2018-08-13 17:57:51 +08:00
Gennadiy Civil 390a6b7932 Mode change on a python script 2018-08-10 15:42:16 -04:00
Gennadiy Civil b46b86ee60 Merge pull request #1719 from happyCoder92/master
docs: fix broken links
2018-08-09 10:54:09 -07:00
Gennadiy Civil 4e13415ff4 Merge branch 'master' into master 2018-08-09 10:40:06 -07:00
Gennadiy Civil acaf5beacc formatting and small changes related to code management, no functionality changes 2018-08-09 13:37:11 -04:00
Gennadiy Civil 4d9411467d code management comments, [ci-skip], no functionality changes 2018-08-09 12:21:49 -04:00
Gennadiy Civil 7a79459a66 Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:55:48 -04:00
Gennadiy Civil d5b31df900 Update gtest-death-test.cc 2018-08-09 11:33:42 -04:00
Gennadiy Civil ecc6944fb1 Fixing identation, causes build errors when warnings are treated as errors 2018-08-09 11:12:12 -04:00
Loo Rong Jie 24786cb498 Merge branch 'master' into deprecate 2018-08-09 20:08:44 +08:00
Wiktor Garbacz db43df6df7 docs: fix broken links 2018-08-09 13:14:36 +02:00
tisi1988 efe27ac05c Merge branch 'master' into master 2018-08-09 10:58:22 +02:00
Gennadiy Civil 11f5a2740a Merge branch 'master' into cross-testing-patch-1 2018-08-08 12:19:04 -07:00
Gennadiy Civil 00fc0d24d1 Formatting tweaks, no functionality changes 2018-08-08 15:14:21 -04:00
Gennadiy Civil 0eeb1afcac code management changes, no functionalty changes 2018-08-08 14:41:21 -04:00
Gennadiy Civil bdf5fd3a98 Merge branch 'master' of https://github.com/google/googletest
Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest
2018-08-08 13:20:02 -04:00
Gennadiy Civil 41e82cadf4 upsream additional printer test 2018-08-07 14:05:42 -04:00
Gennadiy Civil b345bf9090 Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
tisi1988 e9b05a4d6a Merge branch 'master' into master 2018-08-07 11:12:00 +02:00
Gennadiy Civil 886a74769e Merge branch 'master' into suppressDefault 2018-08-06 18:02:42 -07:00
Wez 5d2e503574 No default exception handling 2018-08-03 16:26:16 -07:00
Gennadiy Civil 61f949387e Merge branch 'master' into deprecate 2018-08-03 12:05:07 -04:00
Philipp Paulweber 1da26a77c5 Printers test: fixed compilation bug, due to unnecessary parentheses in declaration 2018-08-03 12:01:30 +02:00
Gennadiy Civil 2a7077fa24 one more fix 2018-08-02 20:03:26 -07:00
Gennadiy Civil b929d55704 cmake fixes 2018-08-02 17:46:43 -04:00
Gennadiy Civil 0d29f9702d more fixes 2018-08-02 17:32:43 -04:00
Gennadiy Civil 95c313e685 add --no_stacktrace_support for json-output-unittest 2018-08-02 16:58:11 -04:00
Gennadiy Civil 94f2c6faa7 fixes tests 2018-08-02 16:51:03 -04:00