diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2018-04-19 14:20:01 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2018-04-26 16:55:03 +0300 |
| commit | 925788fc76499290329863c0954275b74955b3a5 (patch) | |
| tree | dd003f4aa172bf35d74473c9e8b729b0faa6c0d7 | |
| parent | f39249ad589cc82345af7924659fce64511f47e0 (diff) | |
| download | weston-925788fc76499290329863c0954275b74955b3a5.tar.gz weston-925788fc76499290329863c0954275b74955b3a5.tar.bz2 weston-925788fc76499290329863c0954275b74955b3a5.zip | |
Update copyrights for Collabora and General Electric Company
Looking at the diff statistics of the changes authored by me and landed
since 4.0.0 release points out these files as having major changes.
Update the copyright holders accordingly, as both clone mode and
touchscreen calibration related patches are copyright both Collabora and
GE.
I have kept the redundant "Copyright ©" form only to keep things
consistent, even when either the word or the mark would be enough.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Ian Ray <ian.ray@ge.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | compositor/main.c | 3 | ||||
| -rw-r--r-- | libweston/compositor-drm.c | 2 | ||||
| -rw-r--r-- | libweston/compositor.c | 3 | ||||
| -rw-r--r-- | libweston/compositor.h | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/compositor/main.c b/compositor/main.c index f72d3ea1..d1bc8062 100644 --- a/compositor/main.c +++ b/compositor/main.c @@ -1,9 +1,10 @@ /* * Copyright © 2010-2011 Intel Corporation * Copyright © 2008-2011 Kristian Høgsberg - * Copyright © 2012-2015 Collabora, Ltd. + * Copyright © 2012-2018 Collabora, Ltd. * Copyright © 2010-2011 Benjamin Franzke * Copyright © 2013 Jason Ekstrand + * Copyright © 2017, 2018 General Electric Company * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index 23fd8876..92e4cc45 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -1,6 +1,8 @@ /* * Copyright © 2008-2011 Kristian Høgsberg * Copyright © 2011 Intel Corporation + * Copyright © 2017, 2018 Collabora, Ltd. + * Copyright © 2017, 2018 General Electric Company * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/libweston/compositor.c b/libweston/compositor.c index dbf61efe..747c55fa 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -1,7 +1,8 @@ /* * Copyright © 2010-2011 Intel Corporation * Copyright © 2008-2011 Kristian Høgsberg - * Copyright © 2012-2015 Collabora, Ltd. + * Copyright © 2012-2018 Collabora, Ltd. + * Copyright © 2017, 2018 General Electric Company * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/libweston/compositor.h b/libweston/compositor.h index ca234075..26527c61 100644 --- a/libweston/compositor.h +++ b/libweston/compositor.h @@ -1,6 +1,7 @@ /* * Copyright © 2008-2011 Kristian Høgsberg - * Copyright © 2012 Collabora, Ltd. + * Copyright © 2012, 2017, 2018 Collabora, Ltd. + * Copyright © 2017, 2018 General Electric Company * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the |