0xb00bface 500be5eee4 Merge branch 'dev' into v4 ... # Conflicts: # common/src/main/java/ctbrec/recorder/FFmpeg.java		2021-02-13 21:37:39 +01:00
..
.settings	Change context menu behavior to make sense with bookmarked models	2021-01-09 12:45:38 +01:00
src	Merge branch 'dev' into v4	2021-02-13 21:37:39 +01:00
.classpath	Change context menu behavior to make sense with bookmarked models	2021-01-09 12:45:38 +01:00
.gitignore	Add idea project files to .gitignore	2020-11-21 19:20:01 +01:00
.project	Split up project into client, server, common and master	2018-11-18 22:42:13 +01:00
pom.xml	Set version to version 3.13.1	2021-01-24 12:15:18 +01:00