Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h
#	src/courtroom.cpp

1 files changed, 1 insertions, 0 deletions

diff --git a/include/lobby.h b/include/lobby.h
index 42f52977..4278534c 100644
--- a/include/lobby.h
+++ b/include/lobby.h
@@ -46,6 +46,7 @@ public:
   void set_loading_value(int p_value);
 
   bool public_servers_selected = true;
+  bool doubleclicked = false;
 
   ~Lobby();