Merge pull request #2037 from ciband:chore/fix_library_json
1bcbd5871e34
Actions

Authored by Gennadiy Civil <misterg@google.com> on Jan 3 2019, 03:39.

Description

Merge pull request #2037 from ciband:chore/fix_library_json

PiperOrigin-RevId: 227615222

Committed

Gennadiy Civil <misterg@google.com>

Jan 3 2019, 03:39

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

Gennadiy Civil <misterg@google.com> committed R9484:1bcbd5871e34: Merge pull request #2037 from ciband:chore/fix_library_json (authored by Gennadiy Civil <misterg@google.com>).Jan 3 2019, 03:39

	Commit			Author	Details	Committed
	de99386b67a3			chris	Merge branch 'chore/fix_library_json' of https://github.com/ciband/googletest…	Dec 29 2018
	6d5ce40d4c27			chris	fix: Add additional source and include directories.	Dec 29 2018

				Path
	M			README.md
	P			googletest/scripts/common.py Copied from googlemock/scripts/upload_gmock.py
	A			googletest/scripts/release_docs.py
	P			googletest/scripts/upload.py Copied from googlemock/scripts/upload.py
	P			googletest/scripts/upload_gtest.py Copied from googlemock/scripts/upload_gmock.py
	M			googletest/xcode/gtest.xcodeproj/project.pbxproj
	M			library.json