Commit 25e56e5d authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[master] Merge branch 'trac1068'

with fixing conflicts in src/lib/datasrc/tests/database_unittest.cc
parents 87d2a876 64ac0166
......@@ -65,3 +65,4 @@ EXTRA_DIST += testdata/sql1.example.com.signed
EXTRA_DIST += testdata/sql2.example.com.signed
EXTRA_DIST += testdata/test-root.sqlite3
EXTRA_DIST += testdata/test.sqlite3
EXTRA_DIST += testdata/rwtest.sqlite3
This diff is collapsed.
CLEANFILES = *.copied
BUILT_SOURCES = rwtest.sqlite3.copied
rwtest.sqlite3.copied: $(srcdir)/rwtest.sqlite3
cp $(srcdir)/rwtest.sqlite3 $@
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment