Merge branch 'kyoto'

Conflicts:
	common/storage.h
	common/storage_lmdb.cpp
	dummyresource/facade.cpp
	store/test/CMakeLists.txt
	tests/storagebenchmark.cpp

1 files changed, 0 insertions, 12 deletions

diff --git a/store/test/calendar.fbs b/store/test/calendar.fbs
deleted file mode 100644
index 203ee43..0000000
--- a/store/test/calendar.fbs
+++ /dev/null
@@ -1,12 +0,0 @@
-// example IDL file
-
-namespace Calendar;
-
-table Event {
-  summary:string;
-  description:string;
-  attachment:[byte];
-}
-
-root_type Event;
-file_identifier "AKFB";