Merging RC1.20

appnexus · Oct 6, 2014 · 4ed5ac0 · 4ed5ac0
2 parents b196421 + 0e20210
commit 4ed5ac0
Show file tree

Hide file tree

Showing 438 changed files with 15,660 additions and 10,106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -119,3 +119,4 @@ xcuserdata
 # Binary build product files
 
 **/out
+**/Products
diff --git a/BinaryProjects/ANAdapterForGoogleAdMobSDK.xcodeproj/project.pbxproj b/BinaryProjects/ANAdapterForGoogleAdMobSDK.xcodeproj/project.pbxproj
diff --git a/...rojects/ANAdapterForGoogleAdMobSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/...rojects/ANAdapterForGoogleAdMobSDK.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...terForGoogleAdMobSDK.xcodeproj/xcshareddata/xcschemes/ANAdapterForGoogleAdMobSDK.xcscheme b/...terForGoogleAdMobSDK.xcodeproj/xcshareddata/xcschemes/ANAdapterForGoogleAdMobSDK.xcscheme
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,3 +119,4 @@ xcuserdata
		# Binary build product files

		**/out
		**/Products