Homec4science
Diffusion sp4e-homework-lars-bertil 3468af9b36e7

Merge branch 'master' of https://github.com/google/googletest
3468af9b36e7
Actions

Authored by Jerry Turcios <jerryturcios08@gmail.com> on Oct 23 2018, 03:16.

Description

Merge branch 'master' of https://github.com/google/googletest

Details

Committed
Jerry Turcios <jerryturcios08@gmail.com>Oct 23 2018, 03:16
Pushed
• trottetDec 4 2019, 13:52
Parents
R9484:82987067d8cc: Googletest export
R9484:648ac832aa92: Merge branch 'master' of https://github.com/google/googletest
Branches
Unknown
Tags
Unknown

Event Timeline

Jerry Turcios <jerryturcios08@gmail.com> committed R9484:3468af9b36e7: Merge branch 'master' of https://github.com/google/googletest (authored by Jerry Turcios <jerryturcios08@gmail.com>).Oct 23 2018, 03:16

Merged Changes

CommitAuthorDetailsCommitted
82987067d8ccAbseil Team/Gennadiy Civil
Googletest export 
Oct 22 2018
32dbcac06e1fGennadiy Civil
Merge pull request #1839 from Peter-Levine:python3-tests 
Oct 22 2018
572050dd2835Gennadiy Civil
Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix 
Oct 22 2018
c955e3349796Gennadiy Civil/GitHub
Merge branch 'master' into python3-tests 
Oct 19 2018
2c19680bf99dGennadiy Civil/GitHub
Merge branch 'master' into relocatable-pkgconfig-fix 
Oct 17 2018
754cb8ed9643Gennadiy Civil/GitHub
Merge branch 'master' into relocatable-pkgconfig-fix 
Oct 12 2018
095b3113e743Filipp Andjelo/Filipp Andjelo
Use pcfiledir for prefix in pkgconfig file 
Oct 11 2018
3149e0e88bf0Gennadiy Civil/GitHub
Merge branch 'master' into python3-tests 
Oct 5 2018
4b82df5bb3faGennadiy Civil/GitHub
Merge branch 'master' into python3-tests 
Oct 4 2018
907ae9edad16Gennadiy Civil/GitHub
Merge branch 'master' into python3-tests 
Sep 26 2018
a4f57cf49a45Gennadiy Civil/GitHub
Merge branch 'master' into python3-tests 
Sep 25 2018
90943525c5d1Gennadiy Civil/GitHub
Merge branch 'master' into python3-tests 
Sep 20 2018
149c0d24148dPeter Levine
Fix Python3 support 
Sep 15 2018

Changes (14)

Path
Mgooglemock/cmake/gmock.pc.in
Mgooglemock/cmake/gmock_main.pc.in
Mgoogletest/cmake/gtest.pc.in
Mgoogletest/cmake/gtest_main.pc.in
Mgoogletest/include/gtest/internal/gtest-internal.h
Mgoogletest/include/gtest/internal/gtest-param-util.h
Mgoogletest/test/googletest-env-var-test.py
Mgoogletest/test/googletest-filter-unittest.py
Mgoogletest/test/googletest-output-test.py
Mgoogletest/test/googletest-throw-on-failure-test.py
Mgoogletest/test/googletest-uninitialized-test.py
Mgoogletest/test/gtest_unittest.cc
Mgoogletest/test/gtest_xml_output_unittest.py
Mgoogletest/test/gtest_xml_test_utils.py

R9484:3468af9b36e7

View Options

googlemock/cmake/gmock.pc.in

Loading...
View Options

googlemock/cmake/gmock_main.pc.in

Loading...
View Options

googletest/cmake/gtest.pc.in

Loading...
View Options

googletest/cmake/gtest_main.pc.in

Loading...
View Options

googletest/include/gtest/internal/gtest-internal.h

Loading...
View Options

googletest/include/gtest/internal/gtest-param-util.h

Loading...
View Options

googletest/test/googletest-env-var-test.py

Loading...
View Options

googletest/test/googletest-filter-unittest.py

Loading...
View Options

googletest/test/googletest-output-test.py

Loading...
View Options

googletest/test/googletest-throw-on-failure-test.py

Loading...
View Options

googletest/test/googletest-uninitialized-test.py

Loading...
View Options

googletest/test/gtest_unittest.cc

Loading...
View Options

googletest/test/gtest_xml_output_unittest.py

Loading...
View Options

googletest/test/gtest_xml_test_utils.py

Loading...
c4science · Help