Merge pull request #245 from Simperium/v0.6.4

Merges Simperium v0.6.4 Branch
Simperium · Mar 27, 2014 · 5988c0b · 5988c0b
2 parents 0ca3a56 + 5790ff3
commit 5988c0b
Show file tree

Hide file tree

Showing 125 changed files with 2,774 additions and 9,756 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: objective-c
+xcode_project: Simperium.xcodeproj
+xcode_scheme: Framework
diff --git a/External/Lumberjack/DDASLLogger.h b/External/Lumberjack/DDASLLogger.h
diff --git a/External/Lumberjack/DDASLLogger.m b/External/Lumberjack/DDASLLogger.m
diff --git a/External/Lumberjack/DDAbstractDatabaseLogger.h b/External/Lumberjack/DDAbstractDatabaseLogger.h