Commit Graph
100 Commits
Author SHA1 Message Date
Gennadiy Civil 539ee4bc54 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
Gennadiy Civil 012528ccab Merge branch 'master' of https://github.com/google/googletest 2018-07-30 13:35:18 -04:00
Gennadiy Civil b7cb1bc6f9 small tweaks, OSS merge cl 206357486 2018-07-30 13:31:46 -04:00
Gennadiy Civil ec13264af4 added missing comments 2018-07-27 15:05:20 -04:00
Gennadiy Civil 984cba30ed Formatting changes for automatic code management 2018-07-27 11:15:08 -04:00
Gennadiy Civil ed1edf641d Formatting changes, code sync 2018-07-25 10:24:13 -04:00
Gennadiy Civil a02af2f689 code merge 2018-07-20 11:28:58 -04:00
Gennadiy Civil 0c17888bcf code sync 2018-07-19 12:42:39 -04:00
Gennadiy Civil a3509a5aa4 Merge branch 'master' of https://github.com/google/googletest 2018-07-18 14:15:58 -04:00
Gennadiy Civil 3530ab9e43 Code sync 2018-07-18 11:51:14 -04:00
Gennadiy Civil d41bfd732f Fix link 2018-07-18 11:38:18 -04:00
Gennadiy Civil 8d07cfd053 Code sync, mostly formatting and removing outdates 2018-07-18 11:30:36 -04:00
Gennadiy Civil 7e73a7ae6e Formatting and a link 2018-07-18 11:17:19 -04:00
Gennadiy Civil 4abbb774c3 Merge branch 'master' of https://github.com/google/googletest 2018-07-17 17:47:54 -04:00
Gennadiy Civil 5437926b22 Docs sync 2018-07-17 17:47:25 -04:00
Gennadiy Civil 36066cfecf more formatting [skip ci] 2018-07-11 09:42:48 -04:00
Gennadiy Civil 74cccf494a formatting, [ci skip] 2018-07-11 09:38:47 -04:00
Gennadiy Civil 4f9194286c Fix heading
[skip ci]
2018-07-10 17:30:28 -04:00
Gennadiy Civil 50daf299c2 Docs sync
[ci skip]
2018-07-10 17:16:03 -04:00
Gennadiy Civil c7ec59381f ignore .md for appveyor builds 2018-06-13 15:47:07 -04:00
Gennadiy Civil 3847aecb5f Docs sync/internal 2018-06-13 14:29:26 -04:00
Gennadiy Civil d689b273dd Merge branch 'master' of https://github.com/google/googletest 2018-06-13 14:26:52 -04:00
Gennadiy Civil 6a484baf06 Doc sync/internal 2018-06-13 14:26:24 -04:00
Gennadiy Civil 025f48f89b Sync with internal docs 2018-06-11 16:11:55 -04:00
Gennadiy Civil 336a75dce0 Merge branch 'master' of https://github.com/google/googletest 2018-06-11 13:12:22 -04:00
Gennadiy Civil 95a96e1c1d Sync with internal docs 2018-06-11 13:12:14 -04:00
Gennadiy Civil 0b958a03e9 Removed "Documentation.md" not adding value and not consitent with internal docs 2018-06-11 12:07:45 -04:00
Gennadiy Civil 109f848bc8 Rename Samples.md to samples.md and adjust the links 2018-06-11 11:54:27 -04:00
Gennadiy Civil 4490be8789 Rename FAQ.md to faq.md and adjust the links.
Part of documentation rationalization
2018-06-11 11:49:02 -04:00
Gennadiy Civil f213b6399e Merge branch 'master' of https://github.com/google/googletest 2018-06-11 11:40:46 -04:00
Gennadiy Civil 8f87d00398 Rename AdvancedGuide.md to advanced.md and adjust the links.
Part of documentation rationalization work
2018-06-11 11:40:35 -04:00
Gennadiy Civil de47b0d30c Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion rationalzation 2018-06-11 11:26:16 -04:00
Gennadiy Civil f66ab00704 Upstream, cl/199129756
Add printer for std::nullptr_t, addressing https://github.com/google/googletest/issues/1616
2018-06-04 10:45:56 -04:00
Gennadiy Civil 8977af0ecf formatting changes 2018-05-23 11:49:11 -04:00
Gennadiy Civil 28c91e2cea Formatting changes 2018-05-23 11:03:31 -04:00
Gennadiy Civil 9af3793103 merged 2018-04-25 13:16:19 -04:00
Gennadiy Civil b539167cf0 merging, 2018-04-25 13:10:41 -04:00
Gennadiy Civil bb7a018348 reverting, test 2018-04-19 11:28:46 -04:00
Gennadiy Civil 7b4ee66f5f reverting just to test 2018-04-19 11:14:17 -04:00
Gennadiy Civil 62a7c140a7 testing 2018-04-19 10:19:59 -04:00
Gennadiy Civil f312435032 more typos 2018-04-18 17:13:23 -04:00
Gennadiy Civil a0fd742639 msvc 2018-04-18 17:03:42 -04:00
Gennadiy Civil b00e281078 more typos 2018-04-18 16:43:11 -04:00
Gennadiy Civil 881ee307a7 typo 2018-04-18 15:18:03 -04:00
Gennadiy Civil 10e8ec2714 move only types docs 2018-04-18 15:10:07 -04:00
Gennadiy Civil 4d554c391b typo 2018-04-18 15:02:47 -04:00
Gennadiy Civil b4cbf531e9 typo 2018-04-18 14:25:58 -04:00
Gennadiy Civil 78d73814fa http://cl/193386206 2018-04-18 14:21:28 -04:00
Gennadiy Civil a48b95ef81 Merge branch 'master' of github.com:google/googletest 2018-04-18 11:05:12 -04:00
Gennadiy Civil c56ba73a23 merge, explicit, ( should be it) 2018-04-18 11:05:00 -04:00
Gennadiy Civil 88311784e4 Merge branch 'master' of github.com:google/googletest 2018-04-18 10:36:24 -04:00
Gennadiy Civil 4707c0ffd4 193353312 2018-04-18 10:36:12 -04:00
Gennadiy Civil 80d6e26a9c cl/193060888 2018-04-17 19:32:15 -04:00
Gennadiy Civil 5dccf6b79e http://cl/193060888 2018-04-17 16:22:35 -04:00
Gennadiy Civil dff32aff97 http://cl/193060888 2018-04-17 16:12:04 -04:00
Gennadiy Civil 3f88bb1831 test-meerging 2018-04-16 15:52:47 -04:00
Gennadiy Civil ec425d7160 typo 2018-04-16 12:00:37 -04:00
Gennadiy Civil e4ab316c85 more msvc 2018-04-16 11:52:22 -04:00
Gennadiy Civil 1944bc0f51 typo 2018-04-16 11:41:36 -04:00
Gennadiy Civil e9eff488f9 msvc warnings 2018-04-16 11:32:16 -04:00
Gennadiy Civil bd2a1aed03 merging gmock generated matchers 2018-04-16 11:18:49 -04:00
Gennadiy Civil 9fba103156 merging, testing, this should be it 2018-04-16 10:42:08 -04:00
Gennadiy Civil 1c6e68cf6c merging 2018-04-16 10:34:07 -04:00
Gennadiy Civil 26c10dc7e6 merging 2018-04-16 10:16:48 -04:00
Gennadiy Civil d84eb86df5 more pizza 2018-04-13 16:04:34 -04:00
Gennadiy Civil f45728a5ac more OSX pizzas 2018-04-13 15:48:57 -04:00
Gennadiy Civil b74a1af00f osx pizzas 2018-04-13 11:49:37 -04:00
Gennadiy Civil f9bd6180de merging gmock actions test 2018-04-13 11:02:55 -04:00
Gennadiy Civil 0bfa823785 merging, gmock actions test 2018-04-13 11:02:25 -04:00
Gennadiy Civil 6d31084797 Merge branch 'master' of https://github.com/google/googletest 2018-04-13 09:16:56 -04:00
Gennadiy Civil 2dc576ec55 merging 2018-04-13 09:16:40 -04:00
Gennadiy Civil f7330f9f14 more fixing osx libstd++ bugs 2018-04-12 17:00:31 -04:00
Gennadiy Civil 65380492b2 fixing 2018-04-12 16:32:03 -04:00
Gennadiy Civil dc4f5638c2 merging, fix OSX issue 2018-04-12 15:45:21 -04:00
Gennadiy Civil 092ca91072 merging 2018-04-12 14:46:57 -04:00
Gennadiy Civil a79851f2c2 merging 2018-04-12 14:00:38 -04:00
Gennadiy Civil fa658e0cc0 merging 2018-04-12 13:42:47 -04:00
Gennadiy Civil c67f51b5dc msvc 2018-04-12 11:32:17 -04:00
Gennadiy Civil 9b5940e040 revert this one 2018-04-12 10:28:02 -04:00
Gennadiy Civil b2d81b4fb2 merge, ... gmock-matchers test 2018-04-12 09:45:07 -04:00
Gennadiy Civil 07f3bdd4c9 Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:13:38 -04:00
Gennadiy Civil 854adb087b Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:12:15 -04:00
Gennadiy Civil e77deb29a6 small cleanup 2018-04-12 09:12:02 -04:00
Gennadiy Civil 373481c5a9 ...merging 2018-04-11 15:46:57 -04:00
Gennadiy Civil ef17a9f98a Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:38:25 -04:00
Gennadiy Civil 8654c1ca10 merging 2018-04-11 15:33:31 -04:00
Gennadiy Civil af4cfd5088 Merge branch 'master' of https://github.com/google/googletest 2018-04-11 15:24:25 -04:00
Gennadiy Civil ab84d14281 Upstream cl/192179348 2018-04-11 15:24:04 -04:00
Gennadiy Civil 106e731e68 Merge branch 'master' of https://github.com/google/googletest 2018-04-11 13:20:55 -04:00
Gennadiy Civil c13ab6003b merging 2018-04-11 13:20:36 -04:00
Gennadiy Civil 5cd213ea5e ..and this should be it 2018-04-11 10:10:24 -04:00
Gennadiy Civil 6a7573a7de more 2018-04-11 09:55:36 -04:00
Gennadiy Civil 039d9b54c2 pizza work, cont 2018-04-11 09:47:38 -04:00
Gennadiy Civil f15fd9610b osx pizzas, cont 2018-04-11 09:33:51 -04:00
Gennadiy Civil b15be9a819 fixing osx pizza 2018-04-11 09:20:48 -04:00
Gennadiy Civil 6f9db26159 merging 2018-04-10 16:34:21 -04:00
Gennadiy Civil 9bc82ce725 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil 25d8176e4f merging 2018-04-10 16:18:23 -04:00
Gennadiy Civil 39c58da187 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil e1071eb949 RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 2018-04-10 15:57:16 -04:00