diff options
author | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2013-06-08 18:44:34 -0700 |
---|---|---|
committer | Laxmikant Rashinkar <LK.Rashinkar@gmail.com> | 2013-06-08 18:44:34 -0700 |
commit | 78498f66821fe68e4303836a09d42f7f11daaa21 (patch) | |
tree | 64692fe41a7407b98c104c5bb70ebcb91ef7351d /xrdpapi | |
parent | 6ad1d7f78d535d5095d639ae289b5f8d1084a399 (diff) | |
parent | c6fa03102f40e655ba54d5910ad559a8799c15e7 (diff) | |
download | xrdp-proprietary-78498f66821fe68e4303836a09d42f7f11daaa21.tar.gz xrdp-proprietary-78498f66821fe68e4303836a09d42f7f11daaa21.zip |
Merge branch 'master' of github.com:neutrinolabs/xrdp
Diffstat (limited to 'xrdpapi')
-rw-r--r-- | xrdpapi/simple.c | 4 | ||||
-rw-r--r-- | xrdpapi/vrplayer.c | 2 | ||||
-rw-r--r-- | xrdpapi/xrdpapi.c | 4 | ||||
-rw-r--r-- | xrdpapi/xrdpapi.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/xrdpapi/simple.c b/xrdpapi/simple.c index afe1a22c..7a674b69 100644 --- a/xrdpapi/simple.c +++ b/xrdpapi/simple.c @@ -1,8 +1,8 @@ /** * xrdp: A Remote Desktop Protocol server. * - * Copyright (C) Jay Sorg 2012 - * Copyright (C) Laxmikant Rashinkar 2012 + * Copyright (C) Jay Sorg 2012-2013 + * Copyright (C) Laxmikant Rashinkar 2012-2013 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xrdpapi/vrplayer.c b/xrdpapi/vrplayer.c index 442ef35e..1faf127a 100644 --- a/xrdpapi/vrplayer.c +++ b/xrdpapi/vrplayer.c @@ -1,7 +1,7 @@ /** * xrdp: A Remote Desktop Protocol server. * - * Copyright (C) Laxmikant Rashinkar 2012 LK.Rashinkar@gmail.com + * Copyright (C) Laxmikant Rashinkar 2012-2013 LK.Rashinkar@gmail.com * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xrdpapi/xrdpapi.c b/xrdpapi/xrdpapi.c index e3b63035..b544b98b 100644 --- a/xrdpapi/xrdpapi.c +++ b/xrdpapi/xrdpapi.c @@ -1,8 +1,8 @@ /** * xrdp: A Remote Desktop Protocol server. * - * Copyright (C) Jay Sorg 2012 - * Copyright (C) Laxmikant Rashinkar 2012 + * Copyright (C) Jay Sorg 2012-2013 + * Copyright (C) Laxmikant Rashinkar 2012-2013 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/xrdpapi/xrdpapi.h b/xrdpapi/xrdpapi.h index 81e5acd5..ecadceea 100644 --- a/xrdpapi/xrdpapi.h +++ b/xrdpapi/xrdpapi.h @@ -1,9 +1,9 @@ /** * xrdp: A Remote Desktop Protocol server. * - * Copyright (C) Jay Sorg 2012 - * Copyright (C) Thomas Goddard 2012 - * Copyright (C) Laxmikant Rashinkar 2012 + * Copyright (C) Jay Sorg 2012-2013 + * Copyright (C) Thomas Goddard 2012-2013 + * Copyright (C) Laxmikant Rashinkar 2012-2013 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |