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

[toast/confclerk.git] / src / app / appsettings.cpp

diff --git a/src/app/appsettings.cpp b/src/app/appsettings.cpp
index f204bb6578dbaa1602340e7997b43ebb845a376e..642aefb53d7f5d3d2e17b6a8f73323d9aa9d12d9 100644 (file)
--- a/src/app/appsettings.cpp
+++ b/src/app/appsettings.cpp
@@ -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.
  *