0xboobface b476c452ad Merge branch 'dev' into camsoda ... Conflicts: src/main/java/ctbrec/Settings.java src/main/java/ctbrec/recorder/server/HttpServer.java src/main/java/ctbrec/ui/CamrecApplication.java src/main/java/ctbrec/ui/ThumbCell.java		2018-10-30 19:06:20 +01:00
..
assembly	Add assembly descriptor for macOS	2018-10-30 18:21:13 +01:00
main	Merge branch 'dev' into camsoda	2018-10-30 19:06:20 +01:00
test	Add update check	2018-08-28 14:48:00 +02:00