Homec4science

Merge branch 'refs/heads/master' into flag-default

Authored by Alyssa Wilk <alyssar@chromium.org> on Aug 28 2017, 22:10.

Description

Merge branch 'refs/heads/master' into flag-default

Event Timeline

Alyssa Wilk <alyssar@chromium.org> committed R9484:c00373320db8: Merge branch 'refs/heads/master' into flag-default (authored by Alyssa Wilk <alyssar@chromium.org>).Aug 28 2017, 22:10

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
b43bfcf49166Gennadiy Civil/GitHub
Merge pull request #1222 from KindDragon/vs-projects-fix3 
Aug 25 2017
a7eeb6971fdfGennadiy Civil/GitHub
Merge branch 'master' into vs-projects-fix3 
Aug 25 2017
f25921565bbfGennadiy Civil/GitHub
Merge pull request #1221 from KindDragon/vs-projects-fix2 
Aug 25 2017
cb8ebf5c9a04Arkady Shapkin
Support x64 configuration for old VS2015 projects 
Aug 25 2017
45287f3dffa4Arkady Shapkin
Remove gtest VS2005 projects 
Aug 25 2017
eabd5c908d27Gennadiy Civil/GitHub
Merge pull request #1186 from Dani-Hub/master 
Aug 24 2017
87327b12e9b1Gennadiy Civil/GitHub
Merge branch 'master' into master 
Aug 23 2017
c38baf985831Gennadiy Civil/GitHub
Merge pull request #1219 from KindDragon/vs-projects-fix 
Aug 23 2017
ebc7b01d8956Daniel Krügler/GitHub
Merge branch 'master' into master 
Aug 23 2017
f4abce46093dGennadiy Civil/GitHub
Merge branch 'master' into vs-projects-fix 
Aug 23 2017
863e02644b57Gennadiy Civil/GitHub
Merge pull request #1220 from romkatv/property-matcher 
Aug 23 2017
88269cd365faArkady Shapkin
Support x64 configuration for old VS2010 projects 
Aug 23 2017
f8514b8da353drgler
Merge branch 'master' of github.com:Dani-Hub/googletest 
Aug 22 2017
d93ce9d6fb8edrgler
Merge branch 'master' of github.com:Dani-Hub/googletest 
Aug 22 2017
fa3bb1a77973drgler
Merge branch 'master' of github.com:Dani-Hub/googletest 
Aug 22 2017
6404d45a9252drgler
Merge branch 'master' of github.com:Dani-Hub/googletest 
Aug 22 2017
966b549c8803Roman Perepelitsa
Support ref-qualified member functions in Property(). 
Aug 22 2017
8304d06199bdDaniel Krügler/GitHub
Merge branch 'master' into master 
Aug 21 2017
675686a139a7Gennadiy Civil/GitHub
Merge pull request #1206 from ShadowIce/methodname-in-exception 
Aug 21 2017
1ee807965158Maurice Gilden
Remove unused variable 
Aug 21 2017
3cf65b5d86d4Gennadiy Civil/GitHub
Added "explicit" as per compiler suggestion 
Aug 20 2017
026735daf34cGennadiy Civil/GitHub
Proposing these changes, please review 
Aug 20 2017
35737ac7ac1aGennadiy Civil/GitHub
Merge branch 'master' into methodname-in-exception 
Aug 19 2017
780bae0faceaGennadiy Civil/GitHub
Merge pull request #1215 from henryiii/patch-1 
Aug 19 2017
5518a1d350d5Henry Schreiner/GitHub
Adding CMake visibility policy setting 
Aug 18 2017
b0ed43e72447Maurice Gilden
Change tabs to spaces in test case 
Aug 18 2017
36777251c077Maurice Gilden
Switch return type to class without default constructor 
Aug 18 2017
cc99900036aeMaurice Gilden
Fix test if exceptions are not supported 
Aug 18 2017
95f18d99383cMaurice Gilden
adds test for NiceMock with unknown return value 
Aug 18 2017
1183503d11f9Gennadiy Civil/GitHub
Merge branch 'master' into methodname-in-exception 
Aug 17 2017
1fe692ce49f1Gennadiy Civil/GitHub
Update README.md 
Aug 17 2017
8f233a74ebe1Gennadiy Civil/GitHub
Merge branch 'master' into methodname-in-exception 
Aug 17 2017
b7e8a993b412Gennadiy Civil/GitHub
Merge pull request #1205 from mwoehlke-kitware/fix-gtest-install 
Aug 16 2017
5b4166f05fbcMaurice Gilden
Add function name to exception if there's no default action 
Aug 16 2017
9469fb687d04Matthew Woehlke
Fix problem installing gtest when gmock enabled 
Aug 16 2017
5ed471caec6fGennadiy Civil/GitHub
Merge pull request #1204 from gennadiycivil/master 
Aug 15 2017
08b1a1f73cecGennadiy Civil/GitHub
Merge branch 'master' into master 
Aug 15 2017
3f3a3ada2022misterg
Change AppVeyor Status Badge to point to new AppVeyor Project Location 
Aug 15 2017
a4121dd54b58misterg
Change AppVeyor Status Badge to point to new AppVeyor Project Location 
Aug 15 2017
e0fc65c5fbfeGennadiy Civil/GitHub
Merge pull request #1197 from SoapGentoo/pkgconfig 
Aug 14 2017
9cacce4e5ca0David Seifert
Add documentation for pkg-config 
Aug 14 2017
8604c4adac40David Seifert
Add support for pkgconfig 
Aug 14 2017
673c975a963fGennadiy Civil/GitHub
Merge pull request #905 from iignatev/master 
Aug 14 2017
9816b96a6ddcGennadiy Civil/GitHub
Merge pull request #857 from KindDragon/patch-1 
Aug 11 2017
c7f4849c0b71Gennadiy Civil/GitHub
Merge pull request #919 from delaitre/patch-1 
Aug 11 2017
052df998c46bGennadiy Civil/GitHub
Merge pull request #749 from nholthaus/patch-1 
Aug 11 2017
e533ff4bd33cGennadiy Civil/GitHub
Merge pull request #926 from bartshappee/patch-1 
Aug 11 2017
e3bd4cbeaeefGennadiy Civil/GitHub
Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffix 
Aug 11 2017
c81be0f6fc06Gennadiy Civil/GitHub
Merge pull request #871 from tommyleo2/master 
Aug 11 2017
c523461f3ae8Gennadiy Civil/GitHub
Merge pull request #937 from srz-zumix/fix-gtest-port-typo 
Aug 11 2017