Skip to content

Commit

Permalink
Merge from cbrammer/air-sqlite. Integrate work by @nross83 and @cbrammer
Browse files Browse the repository at this point in the history 
, adding support for using encrypted databases.

Merge commit '87846349ecbbe9015d5b465e56b106300e6c7907' into Integrate_cbrammer

Conflicts:
	src/com/probertson/data/SQLRunner.as
	src/com/probertson/data/SQLRunnerUnpooled.as
  • Loading branch information
@probertson
probertson committed May 20, 2011
2 parents a8a811a + 8784634 commit 430f17b
Show file tree
Hide file tree
Showing 4 changed files with 333 additions and 326 deletions.
Loading

0 comments on commit 430f17b

Please sign in to comment.