yahoo / squidb

SquiDB is a SQLite database library for Android and iOS
https://github.com/yahoo/squidb/wiki
Apache License 2.0
1.31k stars 132 forks source link

SquiDB 2.0 #90

Closed sbosley closed 9 years ago

sbosley commented 9 years ago

This PR is to merge the dev_2.0 branch into master as one of the final steps towards launching SquiDB 2.0 (#86). The merge conflicts are related to some minor things in the code generator but rebasing would be a giant pain, so I'll just resolve those conflicts manually and push when we're ready to merge this.