Merged changes from trunk. It still compiles successfully. :-)

[toast/confclerk.git] / src / mvc / room.h

diff --git a/src/mvc/room.h b/src/mvc/room.h
index 613a5146b74459f9495059c75e2a0ee824f498a5..f0820a790d3f06ac2a0e028753d6c6e8bf01710e 100644 (file)
--- a/src/mvc/room.h
+++ b/src/mvc/room.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2013 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2014 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *