Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / qt-console / util / comboutil.h

diff --git a/bacula/src/qt-console/util/comboutil.h b/bacula/src/qt-console/util/comboutil.h
index d440f82a8cb83319c16c09883d4e6cf941b20942..8933b4fea7ad70f1d10af514bfc719e96ac17b88 100644 (file)
--- a/bacula/src/qt-console/util/comboutil.h
+++ b/bacula/src/qt-console/util/comboutil.h
@@ -1,24 +1,26 @@
 #ifndef _COMBOUTIL_H_
 #define _COMBOUTIL_H_
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2007-2014 Free Software Foundation Europe e.V.
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    You may use this file and others of this release according to the
    license defined in the LICENSE file, which includes the Affero General
    Public License, v3.0 ("AGPLv3") and some additional permissions and
    terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
- *   Version $Id$
- *
- *   Combobox helpers - Riccardo Ghetta, May 2008
+ *   Combobox helpers - Riccardo Ghetta, May 2008 
  */
 
 class QComboBox;