Merge branch 'dev-1.0'

isair · Apr 3, 2015 · 43b3d94 · 43b3d94
2 parents 9b26e64 + 0ad18d0
commit 43b3d94
Show file tree

Hide file tree

Showing 19 changed files with 486 additions and 734 deletions.
diff --git a/Examples/SimpleExample/Cartfile b/Examples/SimpleExample/Cartfile
diff --git a/Examples/SimpleExample/Cartfile.resolved b/Examples/SimpleExample/Cartfile.resolved