Manually merged 45dd48d9a175e06bed60e1848b24722f955bd98c from master

diff --git a/shell/main.cpp b/shell/main.cpp
index 9a324c5477e4a8ad51f286a8b024bb675a09d90e..10f6b5be80618f3d8ad0f9240aa3fc7369a90460 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -131,9 +131,12 @@ void setup_console_window()
 
 void print_info()
 {
-       CASPAR_LOG(info) << L"################################################################################";
-       CASPAR_LOG(info) << L"Copyright (c) 2010 Sveriges Television AB, www.casparcg.com, <info@casparcg.com>";
-       CASPAR_LOG(info) << L"################################################################################";
+       CASPAR_LOG(info) << L"############################################################################";
+       CASPAR_LOG(info) << L"CasparCG Server is distributed by the Swedish Broadcasting Corporation (SVT)";
+       CASPAR_LOG(info) << L"under the GNU General Public License GPLv3 or higher.";
+       CASPAR_LOG(info) << L"Please see LICENSE.TXT for details.";
+       CASPAR_LOG(info) << L"http://www.casparcg.com/";
+       CASPAR_LOG(info) << L"############################################################################";
        CASPAR_LOG(info) << L"Starting CasparCG Video and Graphics Playout Server " << env::version();
        CASPAR_LOG(info) << L"on " << win_product_name() << L" " << win_sp_version();
        CASPAR_LOG(info) << cpu_info();