Skip to content

GitLab

Unverified Commit 687964c8 authored by Conor Burgess's avatar Conor Burgess Committed by GitHub
Browse files

Merge branch 'master' into fix-argc

parents f11a8f91 02a8ca87
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
googletest/xcode/Config/ReleaseProject.xcconfig
View file @ 687964c8
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// and examples. It is set in the "Based On:" dropdown in the "Project" info // and examples. It is set in the "Based On:" dropdown in the "Project" info
// dialog. // dialog.
// This file is based on the Xcode Configuration files in: // This file is based on the Xcode Configuration files in:
// http://code.google.com/p/google-toolbox-for-mac/ // https://github.com/google/google-toolbox-for-mac
// //
#include "General.xcconfig" #include "General.xcconfig"
......
googletest/xcode/Config/StaticLibraryTarget.xcconfig
View file @ 687964c8
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// These are static library target settings for libgtest.a. It // These are static library target settings for libgtest.a. It
// is set in the "Based On:" dropdown in the "Target" info dialog. // is set in the "Based On:" dropdown in the "Target" info dialog.
// This file is based on the Xcode Configuration files in: // This file is based on the Xcode Configuration files in:
// http://code.google.com/p/google-toolbox-for-mac/ // https://github.com/google/google-toolbox-for-mac
// //
// Static libs can be included in bundles so make them position independent // Static libs can be included in bundles so make them position independent
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment