diff options
author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-01-05 18:12:48 +0300 |
---|---|---|
committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-01-05 18:12:48 +0300 |
commit | ad2b8e2149c6884fe4478fc3308456316082df62 (patch) | |
tree | 65e93423e61551c4a3183d5def45a4c5a03b6d06 | |
parent | 219c8c9d7779ccbac0249aced24e39fb005e22d0 (diff) |
Update copyright for 2009
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1380 05730e5d-ab1b-0410-a4ac-84af385074fa
149 files changed, 193 insertions, 501 deletions
@@ -1,7 +1,7 @@ -Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net> Copyright (C) 2007, Sebastian Schlingmann <mit_service@users.sourceforge.net> -Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> Copyright (C) 2008, Andreas Messer <andi@bupfen.de> All rights reserved. diff --git a/g15helper/g15helper.c b/g15helper/g15helper.c index 7e3bd9bdf..cd6006350 100644 --- a/g15helper/g15helper.c +++ b/g15helper/g15helper.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/g15helper/g15helper.h b/g15helper/g15helper.h index cd3f1a2cc..4a18a9843 100644 --- a/g15helper/g15helper.h +++ b/g15helper/g15helper.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/g15helper/g15helper.rc b/g15helper/g15helper.rc index 2a60c94e3..ddfe680b0 100644 --- a/g15helper/g15helper.rc +++ b/g15helper/g15helper.rc @@ -31,7 +31,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "Mumble G15 LCD Helper" VALUE "FileVersion", "1.1.7" VALUE "ProductVersion", "1.1.7" - VALUE "LegalCopyright", "Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk>" + VALUE "LegalCopyright", "Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk>" VALUE "OriginalFilename", "mumble-g15-helper.exe" VALUE "ProductName", "Mumble G15 LCD Helper" #ifndef RELEASE_BUILD diff --git a/overlay/d3d9.cpp b/overlay/d3d9.cpp index 1d594ecb9..98e522e8f 100644 --- a/overlay/d3d9.cpp +++ b/overlay/d3d9.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/overlay/lib.cpp b/overlay/lib.cpp index 2160f0207..96626b842 100644 --- a/overlay/lib.cpp +++ b/overlay/lib.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/overlay/lib.h b/overlay/lib.h index 66c66e5ad..979747f87 100644 --- a/overlay/lib.h +++ b/overlay/lib.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/overlay/opengl.cpp b/overlay/opengl.cpp index 53e1d3851..efc7b714d 100644 --- a/overlay/opengl.cpp +++ b/overlay/opengl.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/overlay/overlay.h b/overlay/overlay.h index 15c3c3a47..eeac9b632 100644 --- a/overlay/overlay.h +++ b/overlay/overlay.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/overlay_gl/overlay.c b/overlay_gl/overlay.c index 5c61bfc02..396c9eef1 100644 --- a/overlay_gl/overlay.c +++ b/overlay_gl/overlay.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/plugins/mumble_plugin.h b/plugins/mumble_plugin.h index 2202230a4..949a871c6 100644 --- a/plugins/mumble_plugin.h +++ b/plugins/mumble_plugin.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/scripts/mklic.pl b/scripts/mklic.pl index d36e1eac8..813dd739c 100644 --- a/scripts/mklic.pl +++ b/scripts/mklic.pl @@ -23,6 +23,6 @@ sub spitout($$) { open(F, "> ../src/mumble/licenses.h"); -print F spitout("licenseMumble", "../installer/gpl.txt"); +print F spitout("licenseMumble", "../LICENSE"); close(F); diff --git a/src/ACL.cpp b/src/ACL.cpp index cb617f44a..d64d1fd7a 100644 --- a/src/ACL.cpp +++ b/src/ACL.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Channel.cpp b/src/Channel.cpp index 3f792edd6..f9f0ceab8 100644 --- a/src/Channel.cpp +++ b/src/Channel.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Channel.h b/src/Channel.h index ccc7c7d43..0db23aad2 100644 --- a/src/Channel.h +++ b/src/Channel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Connection.cpp b/src/Connection.cpp index df85d91eb..b11f25670 100644 --- a/src/Connection.cpp +++ b/src/Connection.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Connection.h b/src/Connection.h index 724fb276a..e096477f2 100644 --- a/src/Connection.h +++ b/src/Connection.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/CryptState.cpp b/src/CryptState.cpp index 91c0edf58..7d2b9c78d 100644 --- a/src/CryptState.cpp +++ b/src/CryptState.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/CryptState.h b/src/CryptState.h index 6ef37b5de..bf9a65588 100644 --- a/src/CryptState.h +++ b/src/CryptState.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Group.cpp b/src/Group.cpp index d934ce36d..1d3e93e3a 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Group.h b/src/Group.h index c706f74f0..724f1a00f 100644 --- a/src/Group.h +++ b/src/Group.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Message.cpp b/src/Message.cpp index c2459b4d4..13497d4c2 100644 --- a/src/Message.cpp +++ b/src/Message.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Message.h b/src/Message.h index bad0970ea..b33a224ba 100644 --- a/src/Message.h +++ b/src/Message.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/PacketDataStream.h b/src/PacketDataStream.h index 8d9ecebd2..948cb03dd 100644 --- a/src/PacketDataStream.h +++ b/src/PacketDataStream.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Player.cpp b/src/Player.cpp index 4e098fc03..a6f9ae761 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Player.h b/src/Player.h index a4d0a93ce..be0f38139 100644 --- a/src/Player.h +++ b/src/Player.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/Timer.cpp b/src/Timer.cpp index 3364a09a2..6aa3d0363 100644 --- a/src/Timer.cpp +++ b/src/Timer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/Timer.h b/src/Timer.h index b306de885..bf81fae45 100644 --- a/src/Timer.h +++ b/src/Timer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/Version.h b/src/Version.h index 62a451ace..6ba7ee639 100644 --- a/src/Version.h +++ b/src/Version.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ACLEditor.cpp b/src/mumble/ACLEditor.cpp index 58ae0faaa..93440f431 100644 --- a/src/mumble/ACLEditor.cpp +++ b/src/mumble/ACLEditor.cpp @@ -1,4 +1,4 @@ -/* copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ACLEditor.h b/src/mumble/ACLEditor.h index ed5c0f281..1447e4687 100644 --- a/src/mumble/ACLEditor.h +++ b/src/mumble/ACLEditor.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ALSAAudio.cpp b/src/mumble/ALSAAudio.cpp index ed5b74bde..146adf330 100644 --- a/src/mumble/ALSAAudio.cpp +++ b/src/mumble/ALSAAudio.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ALSAAudio.h b/src/mumble/ALSAAudio.h index eb681f695..06dcb33e2 100644 --- a/src/mumble/ALSAAudio.h +++ b/src/mumble/ALSAAudio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ASIOInput.cpp b/src/mumble/ASIOInput.cpp index 1c7289b88..f845d5049 100644 --- a/src/mumble/ASIOInput.cpp +++ b/src/mumble/ASIOInput.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ASIOInput.h b/src/mumble/ASIOInput.h index f6dbc7c35..36ddbe201 100644 --- a/src/mumble/ASIOInput.h +++ b/src/mumble/ASIOInput.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/About.cpp b/src/mumble/About.cpp index cbe1982e3..aa38f4c88 100644 --- a/src/mumble/About.cpp +++ b/src/mumble/About.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/About.h b/src/mumble/About.h index e2c7ba833..79b1889fc 100644 --- a/src/mumble/About.h +++ b/src/mumble/About.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Audio.cpp b/src/mumble/Audio.cpp index 675e32fce..049c5c6a7 100644 --- a/src/mumble/Audio.cpp +++ b/src/mumble/Audio.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Audio.h b/src/mumble/Audio.h index d965e3d59..05136a531 100644 --- a/src/mumble/Audio.h +++ b/src/mumble/Audio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioConfigDialog.cpp b/src/mumble/AudioConfigDialog.cpp index 1b365ac51..cd1e26b84 100644 --- a/src/mumble/AudioConfigDialog.cpp +++ b/src/mumble/AudioConfigDialog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2008, Andreas Messer <andi@bupfen.de> All rights reserved. diff --git a/src/mumble/AudioConfigDialog.h b/src/mumble/AudioConfigDialog.h index 2d740888b..3f0934686 100644 --- a/src/mumble/AudioConfigDialog.h +++ b/src/mumble/AudioConfigDialog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp index 1df61d2f1..fe953a3c8 100644 --- a/src/mumble/AudioInput.cpp +++ b/src/mumble/AudioInput.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioInput.h b/src/mumble/AudioInput.h index 71a6c8cf7..6cae00bb7 100644 --- a/src/mumble/AudioInput.h +++ b/src/mumble/AudioInput.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp index 8582c6c86..1822c558c 100644 --- a/src/mumble/AudioOutput.cpp +++ b/src/mumble/AudioOutput.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioOutput.h b/src/mumble/AudioOutput.h index f10834718..1bbff22ff 100644 --- a/src/mumble/AudioOutput.h +++ b/src/mumble/AudioOutput.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioStats.cpp b/src/mumble/AudioStats.cpp index f574191ca..e666fbab3 100644 --- a/src/mumble/AudioStats.cpp +++ b/src/mumble/AudioStats.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioStats.h b/src/mumble/AudioStats.h index c336a3e43..18bf6a889 100644 --- a/src/mumble/AudioStats.h +++ b/src/mumble/AudioStats.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp index 69b798b77..82e0fabee 100644 --- a/src/mumble/AudioWizard.cpp +++ b/src/mumble/AudioWizard.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/AudioWizard.h b/src/mumble/AudioWizard.h index ba3ae55b4..f870ea832 100644 --- a/src/mumble/AudioWizard.h +++ b/src/mumble/AudioWizard.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/BanEditor.cpp b/src/mumble/BanEditor.cpp index 8525175c6..f8d3e1f55 100644 --- a/src/mumble/BanEditor.cpp +++ b/src/mumble/BanEditor.cpp @@ -1,4 +1,4 @@ -/* copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/BanEditor.h b/src/mumble/BanEditor.h index 5613c7d41..d359a1dd5 100644 --- a/src/mumble/BanEditor.h +++ b/src/mumble/BanEditor.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp index 4acaee646..36b306495 100644 --- a/src/mumble/ConfigDialog.cpp +++ b/src/mumble/ConfigDialog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ConfigDialog.h b/src/mumble/ConfigDialog.h index 25bada148..106938149 100644 --- a/src/mumble/ConfigDialog.h +++ b/src/mumble/ConfigDialog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp index cabfd51ef..703df9ac1 100644 --- a/src/mumble/ConnectDialog.cpp +++ b/src/mumble/ConnectDialog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ConnectDialog.h b/src/mumble/ConnectDialog.h index d5b5ea350..5c99a0c45 100644 --- a/src/mumble/ConnectDialog.h +++ b/src/mumble/ConnectDialog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/DBus.cpp b/src/mumble/DBus.cpp index b990927af..4f8b533ce 100644 --- a/src/mumble/DBus.cpp +++ b/src/mumble/DBus.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/DBus.h b/src/mumble/DBus.h index 62a3e6856..f7376394b 100644 --- a/src/mumble/DBus.h +++ b/src/mumble/DBus.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/DXAudioInput.cpp b/src/mumble/DXAudioInput.cpp index 7e475305c..6780bf22a 100644 --- a/src/mumble/DXAudioInput.cpp +++ b/src/mumble/DXAudioInput.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/DXAudioInput.h b/src/mumble/DXAudioInput.h index a63c74f05..b5a974fcd 100644 --- a/src/mumble/DXAudioInput.h +++ b/src/mumble/DXAudioInput.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/DXAudioOutput.cpp b/src/mumble/DXAudioOutput.cpp index 11681b93d..454adae74 100644 --- a/src/mumble/DXAudioOutput.cpp +++ b/src/mumble/DXAudioOutput.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/DXAudioOutput.h b/src/mumble/DXAudioOutput.h index afedb36b1..8f483727f 100644 --- a/src/mumble/DXAudioOutput.h +++ b/src/mumble/DXAudioOutput.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Database.cpp b/src/mumble/Database.cpp index 7be442822..d1b0d4255 100644 --- a/src/mumble/Database.cpp +++ b/src/mumble/Database.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Database.h b/src/mumble/Database.h index 74655d0ba..cf0abb6ce 100644 --- a/src/mumble/Database.h +++ b/src/mumble/Database.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/G15LCDEngine_unix.cpp b/src/mumble/G15LCDEngine_unix.cpp index 7d4db9c67..f4aec9c78 100644 --- a/src/mumble/G15LCDEngine_unix.cpp +++ b/src/mumble/G15LCDEngine_unix.cpp @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/G15LCDEngine_unix.h b/src/mumble/G15LCDEngine_unix.h index 9fbf0d4aa..8e07cb315 100644 --- a/src/mumble/G15LCDEngine_unix.h +++ b/src/mumble/G15LCDEngine_unix.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/G15LCDEngine_win.cpp b/src/mumble/G15LCDEngine_win.cpp index 42913c2e6..82ee346ab 100644 --- a/src/mumble/G15LCDEngine_win.cpp +++ b/src/mumble/G15LCDEngine_win.cpp @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/G15LCDEngine_win.h b/src/mumble/G15LCDEngine_win.h index 757acc78c..2a4921b22 100644 --- a/src/mumble/G15LCDEngine_win.h +++ b/src/mumble/G15LCDEngine_win.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp index 3c6965f14..4730384eb 100644 --- a/src/mumble/Global.cpp +++ b/src/mumble/Global.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Global.h b/src/mumble/Global.h index 203374288..692320da8 100644 --- a/src/mumble/Global.h +++ b/src/mumble/Global.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index 0c94e9264..cb328c533 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/GlobalShortcut.h b/src/mumble/GlobalShortcut.h index e0c9a5262..a6099f4a4 100644 --- a/src/mumble/GlobalShortcut.h +++ b/src/mumble/GlobalShortcut.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/GlobalShortcut_macx.cpp b/src/mumble/GlobalShortcut_macx.cpp index 0c5167fcd..45a4e8634 100644 --- a/src/mumble/GlobalShortcut_macx.cpp +++ b/src/mumble/GlobalShortcut_macx.cpp @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/GlobalShortcut_macx.h b/src/mumble/GlobalShortcut_macx.h index 1cac27f04..14325a713 100644 --- a/src/mumble/GlobalShortcut_macx.h +++ b/src/mumble/GlobalShortcut_macx.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp index e57d40f7d..5a97386fa 100644 --- a/src/mumble/GlobalShortcut_unix.cpp +++ b/src/mumble/GlobalShortcut_unix.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/GlobalShortcut_unix.h b/src/mumble/GlobalShortcut_unix.h index c08e596a1..f03e5138e 100644 --- a/src/mumble/GlobalShortcut_unix.h +++ b/src/mumble/GlobalShortcut_unix.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp index ea38583e9..d23040ae6 100644 --- a/src/mumble/GlobalShortcut_win.cpp +++ b/src/mumble/GlobalShortcut_win.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/GlobalShortcut_win.h b/src/mumble/GlobalShortcut_win.h index fd0f477c5..2a79320db 100644 --- a/src/mumble/GlobalShortcut_win.h +++ b/src/mumble/GlobalShortcut_win.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/LCD.cpp b/src/mumble/LCD.cpp index eca3c36f1..b67d9e4a8 100644 --- a/src/mumble/LCD.cpp +++ b/src/mumble/LCD.cpp @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/LCD.h b/src/mumble/LCD.h index fde622d60..a2515fd8c 100644 --- a/src/mumble/LCD.h +++ b/src/mumble/LCD.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/Log.cpp b/src/mumble/Log.cpp index 3dbe3b42e..c5cf1c224 100644 --- a/src/mumble/Log.cpp +++ b/src/mumble/Log.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Log.h b/src/mumble/Log.h index f07f2c04d..3b03826f6 100644 --- a/src/mumble/Log.h +++ b/src/mumble/Log.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index c19f8e2fc..ccc17a459 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/LookConfig.h b/src/mumble/LookConfig.h index 08a7cea85..867f3d33d 100644 --- a/src/mumble/LookConfig.h +++ b/src/mumble/LookConfig.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 444547402..974f3fac1 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/MainWindow.h b/src/mumble/MainWindow.h index b833007fa..74f595a30 100644 --- a/src/mumble/MainWindow.h +++ b/src/mumble/MainWindow.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Messages.cpp b/src/mumble/Messages.cpp index 8d98ae296..08f9e9210 100644 --- a/src/mumble/Messages.cpp +++ b/src/mumble/Messages.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/NetworkConfig.cpp b/src/mumble/NetworkConfig.cpp index 975bf242e..ff7b77fdc 100644 --- a/src/mumble/NetworkConfig.cpp +++ b/src/mumble/NetworkConfig.cpp @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/NetworkConfig.h b/src/mumble/NetworkConfig.h index a39b45a80..1524862f1 100644 --- a/src/mumble/NetworkConfig.h +++ b/src/mumble/NetworkConfig.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
- Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
+ Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk>
All rights reserved.
diff --git a/src/mumble/OSS.cpp b/src/mumble/OSS.cpp index f44276a6f..ab06d2c5c 100644 --- a/src/mumble/OSS.cpp +++ b/src/mumble/OSS.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/OSS.h b/src/mumble/OSS.h index c158bb1ca..e1c22fcc0 100644 --- a/src/mumble/OSS.h +++ b/src/mumble/OSS.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Overlay.cpp b/src/mumble/Overlay.cpp index d66c6b4dc..fa70b61d1 100644 --- a/src/mumble/Overlay.cpp +++ b/src/mumble/Overlay.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/Overlay.h b/src/mumble/Overlay.h index 17985b1c1..95e364d18 100644 --- a/src/mumble/Overlay.h +++ b/src/mumble/Overlay.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Overlay_macx.cpp b/src/mumble/Overlay_macx.cpp index 5f5f737b2..fd853d8cf 100644 --- a/src/mumble/Overlay_macx.cpp +++ b/src/mumble/Overlay_macx.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Overlay_unix.cpp b/src/mumble/Overlay_unix.cpp index ace2062b4..6166a2d84 100644 --- a/src/mumble/Overlay_unix.cpp +++ b/src/mumble/Overlay_unix.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Overlay_win.cpp b/src/mumble/Overlay_win.cpp index b55969133..48bf56053 100644 --- a/src/mumble/Overlay_win.cpp +++ b/src/mumble/Overlay_win.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/PAAudio.cpp b/src/mumble/PAAudio.cpp index 45410f7db..b6e227b6f 100644 --- a/src/mumble/PAAudio.cpp +++ b/src/mumble/PAAudio.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net> All rights reserved. diff --git a/src/mumble/PAAudio.h b/src/mumble/PAAudio.h index 2ab1fb2d3..9a5da0fe2 100644 --- a/src/mumble/PAAudio.h +++ b/src/mumble/PAAudio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net> All rights reserved. diff --git a/src/mumble/PAAudioConfig.cpp b/src/mumble/PAAudioConfig.cpp index ffd6f93a7..de01a4b10 100644 --- a/src/mumble/PAAudioConfig.cpp +++ b/src/mumble/PAAudioConfig.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net> All rights reserved. diff --git a/src/mumble/PAAudioConfig.h b/src/mumble/PAAudioConfig.h index f378dc264..f9019e963 100644 --- a/src/mumble/PAAudioConfig.h +++ b/src/mumble/PAAudioConfig.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net> All rights reserved. diff --git a/src/mumble/PlayerModel.cpp b/src/mumble/PlayerModel.cpp index 86123af50..e2b73b2f6 100644 --- a/src/mumble/PlayerModel.cpp +++ b/src/mumble/PlayerModel.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/PlayerModel.h b/src/mumble/PlayerModel.h index c3d7a182e..063bd4212 100644 --- a/src/mumble/PlayerModel.h +++ b/src/mumble/PlayerModel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Plugins.cpp b/src/mumble/Plugins.cpp index fa575ccd7..01491b859 100644 --- a/src/mumble/Plugins.cpp +++ b/src/mumble/Plugins.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Plugins.h b/src/mumble/Plugins.h index 05a549978..7a244878d 100644 --- a/src/mumble/Plugins.h +++ b/src/mumble/Plugins.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/PositionalSound.cpp b/src/mumble/PositionalSound.cpp index 00c274bc2..66a5eb334 100644 --- a/src/mumble/PositionalSound.cpp +++ b/src/mumble/PositionalSound.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2008, Andreas Messer <andi@bupfen.de> All rights reserved. diff --git a/src/mumble/PositionalSound.h b/src/mumble/PositionalSound.h index 13b5ea387..ac63c345d 100644 --- a/src/mumble/PositionalSound.h +++ b/src/mumble/PositionalSound.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2008, Andreas Messer <andi@bupfen.de> All rights reserved. diff --git a/src/mumble/PulseAudio.cpp b/src/mumble/PulseAudio.cpp index 643f4fdb5..4908ebfe4 100644 --- a/src/mumble/PulseAudio.cpp +++ b/src/mumble/PulseAudio.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/PulseAudio.h b/src/mumble/PulseAudio.h index 8c011570c..3aef16919 100644 --- a/src/mumble/PulseAudio.h +++ b/src/mumble/PulseAudio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp index 45f0df2c7..17a191090 100644 --- a/src/mumble/ServerHandler.cpp +++ b/src/mumble/ServerHandler.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h index 8d5c590c6..55c459510 100644 --- a/src/mumble/ServerHandler.h +++ b/src/mumble/ServerHandler.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index eed55bce2..55e8e2135 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h index d4767a85d..925e57fec 100644 --- a/src/mumble/Settings.h +++ b/src/mumble/Settings.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/TextMessage.cpp b/src/mumble/TextMessage.cpp index 663732d21..6d9133b1e 100644 --- a/src/mumble/TextMessage.cpp +++ b/src/mumble/TextMessage.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/TextMessage.h b/src/mumble/TextMessage.h index 089db29fe..d153f5c61 100644 --- a/src/mumble/TextMessage.h +++ b/src/mumble/TextMessage.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/TextToSpeech.h b/src/mumble/TextToSpeech.h index 0e5c62b04..84f8c33ce 100644 --- a/src/mumble/TextToSpeech.h +++ b/src/mumble/TextToSpeech.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/TextToSpeech_macx.cpp b/src/mumble/TextToSpeech_macx.cpp index 650b319d8..ad29b1854 100644 --- a/src/mumble/TextToSpeech_macx.cpp +++ b/src/mumble/TextToSpeech_macx.cpp @@ -1,6 +1,6 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> Copyright (C) 2007, Sebastian Schlingmann <mit_service@users.sourceforge.net> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp index 52d02ccb6..dda6cd9e5 100644 --- a/src/mumble/TextToSpeech_unix.cpp +++ b/src/mumble/TextToSpeech_unix.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/TextToSpeech_win.cpp b/src/mumble/TextToSpeech_win.cpp index 1b02c585a..8590aa963 100644 --- a/src/mumble/TextToSpeech_win.cpp +++ b/src/mumble/TextToSpeech_win.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/VersionCheck.cpp b/src/mumble/VersionCheck.cpp index 9ba119a8c..1ce47c955 100644 --- a/src/mumble/VersionCheck.cpp +++ b/src/mumble/VersionCheck.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/VersionCheck.h b/src/mumble/VersionCheck.h index 7fd36f529..e75eb919e 100644 --- a/src/mumble/VersionCheck.h +++ b/src/mumble/VersionCheck.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/ViewCert.cpp b/src/mumble/ViewCert.cpp index 773cadfc0..31d2108a4 100644 --- a/src/mumble/ViewCert.cpp +++ b/src/mumble/ViewCert.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/ViewCert.h b/src/mumble/ViewCert.h index 2c0c1baec..c8a2023e2 100644 --- a/src/mumble/ViewCert.h +++ b/src/mumble/ViewCert.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/mumble/WASAPI.cpp b/src/mumble/WASAPI.cpp index 7f3afa801..9f8bcf7f7 100644 --- a/src/mumble/WASAPI.cpp +++ b/src/mumble/WASAPI.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/WASAPI.h b/src/mumble/WASAPI.h index c7ac82191..734fc18d5 100644 --- a/src/mumble/WASAPI.h +++ b/src/mumble/WASAPI.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/licenses.h b/src/mumble/licenses.h index 4805f66e6..7140797a1 100644 --- a/src/mumble/licenses.h +++ b/src/mumble/licenses.h @@ -1,342 +1,34 @@ -static const char *licenseMumble = " GNU GENERAL PUBLIC LICENSE\n" - " Version 2, June 1991\n" - "\n" - " Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n" - " 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" - " Everyone is permitted to copy and distribute verbatim copies\n" - " of this license document, but changing it is not allowed.\n" - "\n" - " Preamble\n" - "\n" - " The licenses for most software are designed to take away your\n" - "freedom to share and change it. By contrast, the GNU General Public\n" - "License is intended to guarantee your freedom to share and change free\n" - "software--to make sure the software is free for all its users. This\n" - "General Public License applies to most of the Free Software\n" - "Foundation's software and to any other program whose authors commit to\n" - "using it. (Some other Free Software Foundation software is covered by\n" - "the GNU Library General Public License instead.) You can apply it to\n" - "your programs, too.\n" - "\n" - " When we speak of free software, we are referring to freedom, not\n" - "price. Our General Public Licenses are designed to make sure that you\n" - "have the freedom to distribute copies of free software (and charge for\n" - "this service if you wish), that you receive source code or can get it\n" - "if you want it, that you can change the software or use pieces of it\n" - "in new free programs; and that you know you can do these things.\n" - "\n" - " To protect your rights, we need to make restrictions that forbid\n" - "anyone to deny you these rights or to ask you to surrender the rights.\n" - "These restrictions translate to certain responsibilities for you if you\n" - "distribute copies of the software, or if you modify it.\n" - "\n" - " For example, if you distribute copies of such a program, whether\n" - "gratis or for a fee, you must give the recipients all the rights that\n" - "you have. You must make sure that they, too, receive or can get the\n" - "source code. And you must show them these terms so they know their\n" - "rights.\n" - "\n" - " We protect your rights with two steps: (1) copyright the software, and\n" - "(2) offer you this license which gives you legal permission to copy,\n" - "distribute and/or modify the software.\n" - "\n" - " Also, for each author's protection and ours, we want to make certain\n" - "that everyone understands that there is no warranty for this free\n" - "software. If the software is modified by someone else and passed on, we\n" - "want its recipients to know that what they have is not the original, so\n" - "that any problems introduced by others will not reflect on the original\n" - "authors' reputations.\n" - "\n" - " Finally, any free program is threatened constantly by software\n" - "patents. We wish to avoid the danger that redistributors of a free\n" - "program will individually obtain patent licenses, in effect making the\n" - "program proprietary. To prevent this, we have made it clear that any\n" - "patent must be licensed for everyone's free use or not licensed at all.\n" - "\n" - " The precise terms and conditions for copying, distribution and\n" - "modification follow.\n" - "\n" - " GNU GENERAL PUBLIC LICENSE\n" - " TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n" - "\n" - " 0. This License applies to any program or other work which contains\n" - "a notice placed by the copyright holder saying it may be distributed\n" - "under the terms of this General Public License. The \"Program\", below,\n" - "refers to any such program or work, and a \"work based on the Program\"\n" - "means either the Program or any derivative work under copyright law:\n" - "that is to say, a work containing the Program or a portion of it,\n" - "either verbatim or with modifications and/or translated into another\n" - "language. (Hereinafter, translation is included without limitation in\n" - "the term \"modification\".) Each licensee is addressed as \"you\".\n" - "\n" - "Activities other than copying, distribution and modification are not\n" - "covered by this License; they are outside its scope. The act of\n" - "running the Program is not restricted, and the output from the Program\n" - "is covered only if its contents constitute a work based on the\n" - "Program (independent of having been made by running the Program).\n" - "Whether that is true depends on what the Program does.\n" - "\n" - " 1. You may copy and distribute verbatim copies of the Program's\n" - "source code as you receive it, in any medium, provided that you\n" - "conspicuously and appropriately publish on each copy an appropriate\n" - "copyright notice and disclaimer of warranty; keep intact all the\n" - "notices that refer to this License and to the absence of any warranty;\n" - "and give any other recipients of the Program a copy of this License\n" - "along with the Program.\n" - "\n" - "You may charge a fee for the physical act of transferring a copy, and\n" - "you may at your option offer warranty protection in exchange for a fee.\n" - "\n" - " 2. You may modify your copy or copies of the Program or any portion\n" - "of it, thus forming a work based on the Program, and copy and\n" - "distribute such modifications or work under the terms of Section 1\n" - "above, provided that you also meet all of these conditions:\n" - "\n" - " a) You must cause the modified files to carry prominent notices\n" - " stating that you changed the files and the date of any change.\n" - "\n" - " b) You must cause any work that you distribute or publish, that in\n" - " whole or in part contains or is derived from the Program or any\n" - " part thereof, to be licensed as a whole at no charge to all third\n" - " parties under the terms of this License.\n" - "\n" - " c) If the modified program normally reads commands interactively\n" - " when run, you must cause it, when started running for such\n" - " interactive use in the most ordinary way, to print or display an\n" - " announcement including an appropriate copyright notice and a\n" - " notice that there is no warranty (or else, saying that you provide\n" - " a warranty) and that users may redistribute the program under\n" - " these conditions, and telling the user how to view a copy of this\n" - " License. (Exception: if the Program itself is interactive but\n" - " does not normally print such an announcement, your work based on\n" - " the Program is not required to print an announcement.)\n" - "\n" - "These requirements apply to the modified work as a whole. If\n" - "identifiable sections of that work are not derived from the Program,\n" - "and can be reasonably considered independent and separate works in\n" - "themselves, then this License, and its terms, do not apply to those\n" - "sections when you distribute them as separate works. But when you\n" - "distribute the same sections as part of a whole which is a work based\n" - "on the Program, the distribution of the whole must be on the terms of\n" - "this License, whose permissions for other licensees extend to the\n" - "entire whole, and thus to each and every part regardless of who wrote it.\n" - "\n" - "Thus, it is not the intent of this section to claim rights or contest\n" - "your rights to work written entirely by you; rather, the intent is to\n" - "exercise the right to control the distribution of derivative or\n" - "collective works based on the Program.\n" - "\n" - "In addition, mere aggregation of another work not based on the Program\n" - "with the Program (or with a work based on the Program) on a volume of\n" - "a storage or distribution medium does not bring the other work under\n" - "the scope of this License.\n" - "\n" - " 3. You may copy and distribute the Program (or a work based on it,\n" - "under Section 2) in object code or executable form under the terms of\n" - "Sections 1 and 2 above provided that you also do one of the following:\n" - "\n" - " a) Accompany it with the complete corresponding machine-readable\n" - " source code, which must be distributed under the terms of Sections\n" - " 1 and 2 above on a medium customarily used for software interchange; or,\n" - "\n" - " b) Accompany it with a written offer, valid for at least three\n" - " years, to give any third party, for a charge no more than your\n" - " cost of physically performing source distribution, a complete\n" - " machine-readable copy of the corresponding source code, to be\n" - " distributed under the terms of Sections 1 and 2 above on a medium\n" - " customarily used for software interchange; or,\n" - "\n" - " c) Accompany it with the information you received as to the offer\n" - " to distribute corresponding source code. (This alternative is\n" - " allowed only for noncommercial distribution and only if you\n" - " received the program in object code or executable form with such\n" - " an offer, in accord with Subsection b above.)\n" - "\n" - "The source code for a work means the preferred form of the work for\n" - "making modifications to it. For an executable work, complete source\n" - "code means all the source code for all modules it contains, plus any\n" - "associated interface definition files, plus the scripts used to\n" - "control compilation and installation of the executable. However, as a\n" - "special exception, the source code distributed need not include\n" - "anything that is normally distributed (in either source or binary\n" - "form) with the major components (compiler, kernel, and so on) of the\n" - "operating system on which the executable runs, unless that component\n" - "itself accompanies the executable.\n" - "\n" - "If distribution of executable or object code is made by offering\n" - "access to copy from a designated place, then offering equivalent\n" - "access to copy the source code from the same place counts as\n" - "distribution of the source code, even though third parties are not\n" - "compelled to copy the source along with the object code.\n" - "\n" - " 4. You may not copy, modify, sublicense, or distribute the Program\n" - "except as expressly provided under this License. Any attempt\n" - "otherwise to copy, modify, sublicense or distribute the Program is\n" - "void, and will automatically terminate your rights under this License.\n" - "However, parties who have received copies, or rights, from you under\n" - "this License will not have their licenses terminated so long as such\n" - "parties remain in full compliance.\n" - "\n" - " 5. You are not required to accept this License, since you have not\n" - "signed it. However, nothing else grants you permission to modify or\n" - "distribute the Program or its derivative works. These actions are\n" - "prohibited by law if you do not accept this License. Therefore, by\n" - "modifying or distributing the Program (or any work based on the\n" - "Program), you indicate your acceptance of this License to do so, and\n" - "all its terms and conditions for copying, distributing or modifying\n" - "the Program or works based on it.\n" - "\n" - " 6. Each time you redistribute the Program (or any work based on the\n" - "Program), the recipient automatically receives a license from the\n" - "original licensor to copy, distribute or modify the Program subject to\n" - "these terms and conditions. You may not impose any further\n" - "restrictions on the recipients' exercise of the rights granted herein.\n" - "You are not responsible for enforcing compliance by third parties to\n" - "this License.\n" - "\n" - " 7. If, as a consequence of a court judgment or allegation of patent\n" - "infringement or for any other reason (not limited to patent issues),\n" - "conditions are imposed on you (whether by court order, agreement or\n" - "otherwise) that contradict the conditions of this License, they do not\n" - "excuse you from the conditions of this License. If you cannot\n" - "distribute so as to satisfy simultaneously your obligations under this\n" - "License and any other pertinent obligations, then as a consequence you\n" - "may not distribute the Program at all. For example, if a patent\n" - "license would not permit royalty-free redistribution of the Program by\n" - "all those who receive copies directly or indirectly through you, then\n" - "the only way you could satisfy both it and this License would be to\n" - "refrain entirely from distribution of the Program.\n" - "\n" - "If any portion of this section is held invalid or unenforceable under\n" - "any particular circumstance, the balance of the section is intended to\n" - "apply and the section as a whole is intended to apply in other\n" - "circumstances.\n" - "\n" - "It is not the purpose of this section to induce you to infringe any\n" - "patents or other property right claims or to contest validity of any\n" - "such claims; this section has the sole purpose of protecting the\n" - "integrity of the free software distribution system, which is\n" - "implemented by public license practices. Many people have made\n" - "generous contributions to the wide range of software distributed\n" - "through that system in reliance on consistent application of that\n" - "system; it is up to the author/donor to decide if he or she is willing\n" - "to distribute software through any other system and a licensee cannot\n" - "impose that choice.\n" - "\n" - "This section is intended to make thoroughly clear what is believed to\n" - "be a consequence of the rest of this License.\n" - "\n" - " 8. If the distribution and/or use of the Program is restricted in\n" - "certain countries either by patents or by copyrighted interfaces, the\n" - "original copyright holder who places the Program under this License\n" - "may add an explicit geographical distribution limitation excluding\n" - "those countries, so that distribution is permitted only in or among\n" - "countries not thus excluded. In such case, this License incorporates\n" - "the limitation as if written in the body of this License.\n" - "\n" - " 9. The Free Software Foundation may publish revised and/or new versions\n" - "of the General Public License from time to time. Such new versions will\n" - "be similar in spirit to the present version, but may differ in detail to\n" - "address new problems or concerns.\n" - "\n" - "Each version is given a distinguishing version number. If the Program\n" - "specifies a version number of this License which applies to it and \"any\n" - "later version\", you have the option of following the terms and conditions\n" - "either of that version or of any later version published by the Free\n" - "Software Foundation. If the Program does not specify a version number of\n" - "this License, you may choose any version ever published by the Free Software\n" - "Foundation.\n" - "\n" - " 10. If you wish to incorporate parts of the Program into other free\n" - "programs whose distribution conditions are different, write to the author\n" - "to ask for permission. For software which is copyrighted by the Free\n" - "Software Foundation, write to the Free Software Foundation; we sometimes\n" - "make exceptions for this. Our decision will be guided by the two goals\n" - "of preserving the free status of all derivatives of our free software and\n" - "of promoting the sharing and reuse of software generally.\n" - "\n" - " NO WARRANTY\n" - "\n" - " 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n" - "FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\n" - "OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n" - "PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n" - "OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n" - "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\n" - "TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\n" - "PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n" - "REPAIR OR CORRECTION.\n" - "\n" - " 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n" - "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n" - "REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n" - "INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n" - "OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n" - "TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n" - "YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n" - "PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n" - "POSSIBILITY OF SUCH DAMAGES.\n" - "\n" - " END OF TERMS AND CONDITIONS\n" - "\n" - " How to Apply These Terms to Your New Programs\n" - "\n" - " If you develop a new program, and you want it to be of the greatest\n" - "possible use to the public, the best way to achieve this is to make it\n" - "free software which everyone can redistribute and change under these terms.\n" - "\n" - " To do so, attach the following notices to the program. It is safest\n" - "to attach them to the start of each source file to most effectively\n" - "convey the exclusion of warranty; and each file should have at least\n" - "the \"copyright\" line and a pointer to where the full notice is found.\n" - "\n" - " <one line to give the program's name and a brief idea of what it does.>\n" - " Copyright (C) <year> <name of author>\n" - "\n" - " This program is free software; you can redistribute it and/or modify\n" - " it under the terms of the GNU General Public License as published by\n" - " the Free Software Foundation; either version 2 of the License, or\n" - " (at your option) any later version.\n" - "\n" - " This program is distributed in the hope that it will be useful,\n" - " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - " GNU General Public License for more details.\n" - "\n" - " You should have received a copy of the GNU General Public License\n" - " along with this program; if not, write to the Free Software\n" - " Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n" - "\n" - "\n" - "Also add information on how to contact you by electronic and paper mail.\n" - "\n" - "If the program is interactive, make it output a short notice like this\n" - "when it starts in an interactive mode:\n" - "\n" - " Gnomovision version 69, Copyright (C) year name of author\n" - " Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n" - " This is free software, and you are welcome to redistribute it\n" - " under certain conditions; type `show c' for details.\n" - "\n" - "The hypothetical commands `show w' and `show c' should show the appropriate\n" - "parts of the General Public License. Of course, the commands you use may\n" - "be called something other than `show w' and `show c'; they could even be\n" - "mouse-clicks or menu items--whatever suits your program.\n" - "\n" - "You should also get your employer (if you work as a programmer) or your\n" - "school, if any, to sign a \"copyright disclaimer\" for the program, if\n" - "necessary. Here is a sample; alter the names:\n" - "\n" - " Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n" - " `Gnomovision' (which makes passes at compilers) written by James Hacker.\n" - "\n" - " <signature of Ty Coon>, 1 April 1989\n" - " Ty Coon, President of Vice\n" - "\n" - "This General Public License does not permit incorporating your program into\n" - "proprietary programs. If your program is a subroutine library, you may\n" - "consider it more useful to permit linking proprietary applications with the\n" - "library. If this is what you want to do, use the GNU Library General\n" - "Public License instead of this License."; +static const char *licenseMumble = "Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>\n" +"Copyright (C) 2007, Stefan Gehn <mETz AT gehn DOT net>\n" +"Copyright (C) 2007, Sebastian Schlingmann <mit_service@users.sourceforge.net>\n" +"Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk>\n" +"Copyright (C) 2008, Andreas Messer <andi@bupfen.de>\n" +"\n" +"All rights reserved.\n" +"\n" +"Redistribution and use in source and binary forms, with or without\n" +"modification, are permitted provided that the following conditions\n" +"are met:\n" +"\n" +"- Redistributions of source code must retain the above copyright notice,\n" +" this list of conditions and the following disclaimer.\n" +"- Redistributions in binary form must reproduce the above copyright notice,\n" +" this list of conditions and the following disclaimer in the documentation\n" +" and/or other materials provided with the distribution.\n" +"- Neither the name of the Mumble Developers nor the names of its\n" +" contributors may be used to endorse or promote products derived from this\n" +" software without specific prior written permission.\n" +"\n" +"THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n" +"`AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n" +"LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n" +"A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR\n" +"CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,\n" +"EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n" +"PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR\n" +"PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n" +"LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n" +"NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\n" +"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index 80cbefed5..2d53dbb0e 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/mumble/mumble.rc b/src/mumble/mumble.rc index 955a58cfa..f77b17b85 100644 --- a/src/mumble/mumble.rc +++ b/src/mumble/mumble.rc @@ -31,7 +31,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "Mumble - Low-latency VoIP client" VALUE "FileVersion", "1.1.7" VALUE "ProductVersion", "1.1.7" - VALUE "LegalCopyright", "Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>" + VALUE "LegalCopyright", "Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>" VALUE "OriginalFilename", "mumble.exe" VALUE "ProductName", "Mumble" #ifndef RELEASE_BUILD diff --git a/src/mumble/os_macx.cpp b/src/mumble/os_macx.cpp index 97867ecc8..289aeb58d 100644 --- a/src/mumble/os_macx.cpp +++ b/src/mumble/os_macx.cpp @@ -1,5 +1,5 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> - Copyright (C) 2008, Mikkel Krautz <mikkel@krautz.dk> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk> All rights reserved. diff --git a/src/mumble/os_win.cpp b/src/mumble/os_win.cpp index f503c3f5b..e9de40487 100644 --- a/src/mumble/os_win.cpp +++ b/src/mumble/os_win.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index f439c3cf3..3d12337b8 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/murmur/DBus.cpp b/src/murmur/DBus.cpp index 7c95b9457..da45f7416 100644 --- a/src/murmur/DBus.cpp +++ b/src/murmur/DBus.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/DBus.h b/src/murmur/DBus.h index bc4c67e19..e4ec67dc3 100644 --- a/src/murmur/DBus.h +++ b/src/murmur/DBus.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index b357e23de..6f0dc00ee 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Meta.cpp b/src/murmur/Meta.cpp index af82180b1..37fbc02a3 100644 --- a/src/murmur/Meta.cpp +++ b/src/murmur/Meta.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Meta.h b/src/murmur/Meta.h index 93ee1135f..99ec761ec 100644 --- a/src/murmur/Meta.h +++ b/src/murmur/Meta.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index bc74ea972..3f8934547 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/MurmurIce.h b/src/murmur/MurmurIce.h index 902f456b2..9fd92a5a8 100644 --- a/src/murmur/MurmurIce.h +++ b/src/murmur/MurmurIce.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp index 28b87f5e1..35759180e 100644 --- a/src/murmur/RPC.cpp +++ b/src/murmur/RPC.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Register.cpp b/src/murmur/Register.cpp index 498c86e3b..51b04a317 100644 --- a/src/murmur/Register.cpp +++ b/src/murmur/Register.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index b36776b0a..29b6db5f7 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Server.h b/src/murmur/Server.h index 820a71375..4570b91fd 100644 --- a/src/murmur/Server.h +++ b/src/murmur/Server.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index 3e49a30b1..d50ebd15d 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/ServerDB.h b/src/murmur/ServerDB.h index 4f60a5e77..79fecd4b0 100644 --- a/src/murmur/ServerDB.h +++ b/src/murmur/ServerDB.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/Tray.cpp b/src/murmur/Tray.cpp index 116ffa70d..d8b5f773c 100644 --- a/src/murmur/Tray.cpp +++ b/src/murmur/Tray.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/murmur/Tray.h b/src/murmur/Tray.h index 3cfa2344c..aa6cd447c 100644 --- a/src/murmur/Tray.h +++ b/src/murmur/Tray.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/murmur/UnixMurmur.cpp b/src/murmur/UnixMurmur.cpp index bf78c57e3..0521f4405 100644 --- a/src/murmur/UnixMurmur.cpp +++ b/src/murmur/UnixMurmur.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/UnixMurmur.h b/src/murmur/UnixMurmur.h index bfa34e891..cb8d10e36 100644 --- a/src/murmur/UnixMurmur.h +++ b/src/murmur/UnixMurmur.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
diff --git a/src/murmur/main.cpp b/src/murmur/main.cpp index f8db03cda..a37f7624d 100644 --- a/src/murmur/main.cpp +++ b/src/murmur/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com> +/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> All rights reserved. diff --git a/src/murmur/murmur.rc b/src/murmur/murmur.rc index b64326fba..00c4e222f 100644 --- a/src/murmur/murmur.rc +++ b/src/murmur/murmur.rc @@ -31,7 +31,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "Murmur - Low-latency VoIP server"
VALUE "FileVersion", "1.1.7"
VALUE "ProductVersion", "1.1.7"
- VALUE "LegalCopyright", "Copyright (C) 2005-2008, Thorvald Natvig <thorvald@natvig.com>"
+ VALUE "LegalCopyright", "Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>"
VALUE "OriginalFilename", "murmur.exe"
VALUE "ProductName", "Mumble"
#ifndef RELEASE_BUILD
|