Whirlwind 5615cf12de Merge branch 'master' into new_cancel_logic ... Conflicts: SDWebImage/MKAnnotationView+WebCache.m SDWebImage/UIButton+WebCache.m SDWebImage/UIImageView+HighlightedWebCache.h SDWebImage/UIImageView+HighlightedWebCache.m SDWebImage/UIImageView+WebCache.m		2014-06-20 10:51:17 +08:00
..
xcshareddata/xcschemes	Update projects to recommended settings	2014-05-21 17:10:25 +09:00
project.pbxproj	Merge branch 'master' into new_cancel_logic	2014-06-20 10:51:17 +08:00