3 Commits

Author	SHA1	Message	Date
Marcel Schwarz	dc524ac00c	solved merge problems ... This reverts commit 268a8ea290224c0d4de615683d4c8529df7d5252.	2018-06-11 17:56:22 +02:00
Marcel Schwarz	6e8ff050fd	Revert "Merge branch 'master' of https://github.com/iCaotix/ipr-projekt" ... This reverts commit ebb6e4eed752d33cb4b2f2eb70750cf1487b5787, reversing changes made to 40398a69392f63fef161a5725cc1122625958dae.	2018-06-11 17:42:44 +02:00
Marcel Schwarz	09debbdc9d	updated new entry handling	2018-06-11 00:59:10 +02:00