From 6ce5a244603d06d255e2bdb6ff44537d5684a7f1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 9 Apr 2014 09:44:38 -0700 Subject: [PATCH] missed copyright cleanups in apache header --- cmake/macros/IncludeGLM.cmake | 2 +- cmake/macros/SetupHifiProject.cmake | 2 +- cmake/modules/FindFaceshift.cmake | 2 +- cmake/modules/FindGLEW.cmake | 3 ++- cmake/modules/FindGLUT.cmake | 1 + cmake/modules/FindLibOVR.cmake | 2 +- cmake/modules/FindQxmpp.cmake | 2 +- cmake/modules/FindSixense.cmake | 2 +- cmake/modules/FindVisage.cmake | 2 +- domain-server/src/main.cpp | 6 ++++++ examples/defaultScripts.js | 1 + examples/lookWithMouse.js | 2 +- examples/lookWithTouch.js | 2 +- examples/menuExample.js | 2 +- interface/InterfaceConfig.h.in | 7 +++++-- interface/InterfaceVersion.h.in | 9 +++++++-- 16 files changed, 32 insertions(+), 15 deletions(-) diff --git a/cmake/macros/IncludeGLM.cmake b/cmake/macros/IncludeGLM.cmake index 65974a51c5..a31324993e 100644 --- a/cmake/macros/IncludeGLM.cmake +++ b/cmake/macros/IncludeGLM.cmake @@ -1,7 +1,7 @@ # # IncludeGLM.cmake # -# Copyright (c) 2013 High Fidelity +# Copyright 2013 High Fidelity, Inc. # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake index 11252e2a74..50cd3a4150 100644 --- a/cmake/macros/SetupHifiProject.cmake +++ b/cmake/macros/SetupHifiProject.cmake @@ -1,7 +1,7 @@ # # SetupHifiProject.cmake # -# Copyright (c) 2013 High Fidelity +# Copyright 2013 High Fidelity, Inc. # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/cmake/modules/FindFaceshift.cmake b/cmake/modules/FindFaceshift.cmake index 9b407c353f..faf556e06c 100644 --- a/cmake/modules/FindFaceshift.cmake +++ b/cmake/modules/FindFaceshift.cmake @@ -12,7 +12,7 @@ # FACESHIFT_LIBRARIES - Link this to use Faceshift # # Created on 8/30/2013 by Andrzej Kapolka -# Copyright (c) 2013 High Fidelity +# Copyright 2013 High Fidelity, Inc. # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/cmake/modules/FindGLEW.cmake b/cmake/modules/FindGLEW.cmake index 160cfedc5a..68e3248850 100644 --- a/cmake/modules/FindGLEW.cmake +++ b/cmake/modules/FindGLEW.cmake @@ -9,9 +9,10 @@ # GLEW_LIBRARY # # Created on 2/6/2014 by Stephen Birarda +# Copyright 2014 High Fidelity, Inc. # # Adapted from FindGLEW.cmake available in the nvidia-texture-tools repository -# (https://code.google.com/p/nvidia-texture-tools/source/browse/trunk/cmake/FindGLEW.cmake?r=96) +# (https://code.google.com/p/nvidia-texture-tools/source/browse/trunk/cmake/FindGLEW.cmake?r=96) # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/cmake/modules/FindGLUT.cmake b/cmake/modules/FindGLUT.cmake index fe41dc5df8..280a6ac6db 100644 --- a/cmake/modules/FindGLUT.cmake +++ b/cmake/modules/FindGLUT.cmake @@ -10,6 +10,7 @@ # GLUT_DLL_PATH - Optionally defined for Win32, if not in path # # Created on 2/6/2014 by Stephen Birarda +# Copyright 2014 High Fidelity, Inc. # # Adapted from FindGLUT.cmake available in tlorach's OpenGLText Repository # https://raw.github.com/tlorach/OpenGLText/master/cmake/FindGLUT.cmake diff --git a/cmake/modules/FindLibOVR.cmake b/cmake/modules/FindLibOVR.cmake index 811fdb73d4..c07b4c14c1 100644 --- a/cmake/modules/FindLibOVR.cmake +++ b/cmake/modules/FindLibOVR.cmake @@ -12,7 +12,7 @@ # LIBOVR_LIBRARIES - Link this to use LibOVR # # Created on 5/9/2013 by Stephen Birarda -# Copyright (c) 2013 High Fidelity +# Copyright 2013 High Fidelity, Inc. # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/cmake/modules/FindQxmpp.cmake b/cmake/modules/FindQxmpp.cmake index caeb35219d..d5f23143f6 100644 --- a/cmake/modules/FindQxmpp.cmake +++ b/cmake/modules/FindQxmpp.cmake @@ -12,7 +12,7 @@ # QXMPP_LIBRARIES - Link this to use qxmpp # # Created on 3/10/2014 by Stephen Birarda -# Copyright (c) 2014 High Fidelity +# Copyright 2014 High Fidelity, Inc. # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/cmake/modules/FindSixense.cmake b/cmake/modules/FindSixense.cmake index 74965f5734..02b6e3fc21 100644 --- a/cmake/modules/FindSixense.cmake +++ b/cmake/modules/FindSixense.cmake @@ -12,7 +12,7 @@ # SIXENSE_LIBRARIES - Link this to use Sixense # # Created on 11/15/2013 by Andrzej Kapolka -# Copyright (c) 2013 High Fidelity +# Copyright 2013 High Fidelity, Inc. # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/cmake/modules/FindVisage.cmake b/cmake/modules/FindVisage.cmake index 6d204e4649..0aa57f6508 100644 --- a/cmake/modules/FindVisage.cmake +++ b/cmake/modules/FindVisage.cmake @@ -12,7 +12,7 @@ # VISAGE_LIBRARIES - Link this to use Visage # # Created on 2/11/2014 by Andrzej Kapolka -# Copyright (c) 2014 High Fidelity +# Copyright 2014 High Fidelity, Inc. # # Distributed under the Apache License, Version 2.0. # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index d79f06365d..2c8c3bd4c4 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -5,6 +5,12 @@ // Created by Philip Rosedale on 11/20/12. // Copyright 2012 High Fidelity, Inc. // +// The Domain Server keeps a list of nodes that have connected to it, and echoes that list of +// nodes out to nodes when they check in. +// +// The connection is stateless... the domain server will set you inactive if it does not hear from +// you in LOGOFF_CHECK_INTERVAL milliseconds, meaning your info will not be sent to other users. +// // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // diff --git a/examples/defaultScripts.js b/examples/defaultScripts.js index ede2d0f6b6..b3f9649883 100644 --- a/examples/defaultScripts.js +++ b/examples/defaultScripts.js @@ -6,6 +6,7 @@ // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// Script.include("lookWithTouch.js"); Script.include("editVoxels.js"); diff --git a/examples/lookWithMouse.js b/examples/lookWithMouse.js index 9110218026..256a3ea67c 100644 --- a/examples/lookWithMouse.js +++ b/examples/lookWithMouse.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/28/14. -// Copyright (c) 2014 High Fidelity, Inc. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that demonstrates use of the Controller class // diff --git a/examples/lookWithTouch.js b/examples/lookWithTouch.js index 5f5e2ee41c..68b29c305b 100644 --- a/examples/lookWithTouch.js +++ b/examples/lookWithTouch.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 1/28/14. -// Copyright (c) 2014 High Fidelity, Inc. +// Copyright 2014 High Fidelity, Inc. // // This is an example script that demonstrates use of the Controller class // diff --git a/examples/menuExample.js b/examples/menuExample.js index ed6f29d53a..00c6418269 100644 --- a/examples/menuExample.js +++ b/examples/menuExample.js @@ -3,7 +3,7 @@ // examples // // Created by Brad Hefta-Gaub on 2/24/14 -// Copyright (c) 2013 High Fidelity, Inc. +// Copyright 2013 High Fidelity, Inc. // // This is an example script that demonstrates use of the Menu object // diff --git a/interface/InterfaceConfig.h.in b/interface/InterfaceConfig.h.in index 0b570f622f..b2b1881d67 100644 --- a/interface/InterfaceConfig.h.in +++ b/interface/InterfaceConfig.h.in @@ -1,9 +1,12 @@ // // InterfaceConfig.h -// interface +// interface/src // // Created by Stephen Birarda on 2/8/13. -// Copyright (c) 2013 High Fidelity, Inc.. All rights reserved. +// Copyright 2013 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // #ifndef interface__InterfaceConfig__ diff --git a/interface/InterfaceVersion.h.in b/interface/InterfaceVersion.h.in index 60e51b4ab6..2f902de41c 100644 --- a/interface/InterfaceVersion.h.in +++ b/interface/InterfaceVersion.h.in @@ -1,9 +1,14 @@ // // InterfaceVersion.h -// Declaration of version and build data +// interface/src // // Created by Leonardo Murillo on 12/16/13. -// Copyright (c) 2013 High Fidelity, Inc.. All rights reserved. +// Copyright 2013 High Fidelity, Inc. +// +// Declaration of version and build data +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // const QString BUILD_VERSION = "@BUILD_SEQ@";