Commit graph

3 commits

Author SHA1 Message Date
Mattt Thompson
358ecb568c Merge branch 'experimental-0.7' into experimental-mac
Conflicts:
	AFNetworking/AFHTTPRequestOperation.m
	AFNetworking/AFImageRequestOperation.h
	AFNetworking/AFImageRequestOperation.m
	AFNetworking/AFNetworkActivityIndicatorManager.m
2011-10-11 10:01:44 -05:00
Mattt Thompson
80a0c65608 Merge branch 'master' into experimental-mac
Conflicts:
	AFNetworking/AFNetworkActivityIndicatorManager.m
	iOS Example/AFNetworking iOS Example.xcodeproj/project.pbxproj
2011-10-11 09:58:00 -05:00
Mattt Thompson
efdaedc541 Adding Mac example project
Renaming iOS example project

Adding AFNetworking to Mac project using preprocessor macros to resolve UIKit dependencies, and setting compiler flags accordingly.
2011-09-23 12:19:40 -05:00