Merge branch 'kyoto'

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

1 files changed, 12 insertions, 0 deletions

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