Merge branch 'master' of ssh://w-nz.com:33933/home/kn/sjorsg/git/libmarietje into...
-rw-r--r-- 61 .gitignore
-rw-r--r-- 336 libmarietje.pro
-rw-r--r-- 264 libmarietje_global.h
-rw-r--r-- 222 main.cpp
-rw-r--r-- 17499 marietje.cpp
-rw-r--r-- 2118 marietje.h