Merge branch 'webapi_rewrite' of ssh://marietjeviewer/home/kn/sjorsg/git/libmarietje
-rw-r--r-- 61 .gitignore
-rw-r--r-- 320 libmarietje.pro
-rw-r--r-- 264 libmarietje_global.h
-rw-r--r-- 222 main.cpp
-rw-r--r-- 16240 marietje.cpp
-rw-r--r-- 2066 marietje.h