-
JINMEI Tatuya authored
with fixing conflicts: src/lib/datasrc/database.cc src/lib/datasrc/database.h src/lib/datasrc/sqlite3_accessor.cc src/lib/datasrc/tests/Makefile.am src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
e2ada81c
with fixing conflicts: src/lib/datasrc/database.cc src/lib/datasrc/database.h src/lib/datasrc/sqlite3_accessor.cc src/lib/datasrc/tests/Makefile.am src/lib/datasrc/tests/sqlite3_accessor_unittest.cc