Commit graph

2 commits

Author SHA1 Message Date
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
5677b6de94 Adding AFNetworking workspace, containing both the iOS and Mac example applications
Restructuring project files, directories, etc.
2011-09-23 12:54:14 -05:00