Merge branch 'master' of github.com:jasperblues/Typhoon

# By Robert Gilliam (6) and Jasper Blues (4) # Via Jasper Blues * 'master' of github.com:jasperblues/Typhoon: Update podspec. Clean up method names. revert to bba8437 Fix broken tests. make schemes shared replace External directory with cocoapods. seperate the static library and tests into different projects. change isEqualTo: to isEqual: to fix iOS build errors add an iOS Tests target. rename existing Tests to OS X Tests. now who put that space there make autocomplete for blocks in TyphoonDefinition factory methods include variable names Conflicts: Source/Factory/Xml/TyphoonRXMLElement+XmlComponentFactory.h
appsquickly · Jul 23, 2013 · 297e2aa · 297e2aa
2 parents f5bcd33 + e37dadd
commit 297e2aa
Show file tree

Hide file tree

Showing 527 changed files with 15,874 additions and 1,858 deletions.
diff --git a/External/OCHamcrest.framework/Headers b/External/OCHamcrest.framework/Headers
diff --git a/External/OCHamcrest.framework/OCHamcrest b/External/OCHamcrest.framework/OCHamcrest
diff --git a/External/OCHamcrest.framework/Resources b/External/OCHamcrest.framework/Resources
diff --git a/External/OCHamcrest.framework/Versions/A/OCHamcrest b/External/OCHamcrest.framework/Versions/A/OCHamcrest
diff --git a/External/OCHamcrest.framework/Versions/A/Resources/Info.plist b/External/OCHamcrest.framework/Versions/A/Resources/Info.plist
diff --git a/External/OCHamcrest.framework/Versions/Current b/External/OCHamcrest.framework/Versions/Current
diff --git a/External/OCMockito.framework/OCMockito b/External/OCMockito.framework/OCMockito
diff --git a/External/OCMockito.framework/Resources/Info.plist b/External/OCMockito.framework/Resources/Info.plist
diff --git a/External/OCMockito.framework/Versions/A/Headers/MKTClassObjectMock.h b/External/OCMockito.framework/Versions/A/Headers/MKTClassObjectMock.h
diff --git a/External/OCMockito.framework/Versions/A/Headers/MKTObjectAndProtocolMock.h b/External/OCMockito.framework/Versions/A/Headers/MKTObjectAndProtocolMock.h
diff --git a/External/OCMockito.framework/Versions/A/Headers/MKTObjectMock.h b/External/OCMockito.framework/Versions/A/Headers/MKTObjectMock.h
diff --git a/External/OCMockito.framework/Versions/A/Headers/MKTOngoingStubbing.h b/External/OCMockito.framework/Versions/A/Headers/MKTOngoingStubbing.h
diff --git a/External/OCMockito.framework/Versions/A/Headers/MKTPrimitiveArgumentMatching.h b/External/OCMockito.framework/Versions/A/Headers/MKTPrimitiveArgumentMatching.h
diff --git a/External/OCMockito.framework/Versions/A/Headers/MKTProtocolMock.h b/External/OCMockito.framework/Versions/A/Headers/MKTProtocolMock.h