Commit Graph

6 Commits

Author SHA1 Message Date
Nick Foster
0f38bfd0d7 Fix SQL for merge-induced breakage. 2012-10-10 08:21:17 -07:00
Nick Foster
67b58d7204 Use a common lock for the KMLgen and SQL threads to keep them from stepping on each other when reading the SQLite db 2012-10-09 23:31:02 -07:00
Johnathan Corgan
f18d111e1c Merge branch 'master' into qtapp
Conflicts:
	CMakeLists.txt
	lib/air_modes_preamble.cc
	python/sql.py
2012-10-07 17:54:03 -07:00
Nick Foster
73ca9e373e Merge branch 'master' into qtapp 2012-08-15 20:15:55 -07:00
Nick Foster
004500a5d7 Layout and porting the SQL fix over from master. 2012-07-18 17:11:19 -07:00
Nick Foster
3163fca47a Renamed everything in python/ for consistent namespace 2012-07-16 20:59:37 -07:00