Diff between c2e5d1ff16f43a31f14e736d6e611879b3953dfa and 30e2aaa3f80e77c9080e71e4a641a7df81a9958b

Changed Files

File Additions Deletions Status
gobex/gobex-apparam.c +3 -2 modified
gobex/gobex-apparam.h +3 -2 modified
gobex/gobex-debug.h +3 -2 modified
gobex/gobex-defs.c +3 -2 modified
gobex/gobex-defs.h +3 -2 modified
gobex/gobex-header.c +3 -2 modified
gobex/gobex-header.h +3 -2 modified
gobex/gobex-packet.c +3 -2 modified
gobex/gobex-packet.h +3 -2 modified
gobex/gobex-transfer.c +3 -2 modified
gobex/gobex.c +3 -2 modified
gobex/gobex.h +3 -2 modified

Full Patch

diff --git a/gobex/gobex-apparam.c b/gobex/gobex-apparam.c
index 442a3f1..4328172 100644
--- a/gobex/gobex-apparam.c
+++ b/gobex/gobex-apparam.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-apparam.h b/gobex/gobex-apparam.h
index 46e20d2..6c08609 100644
--- a/gobex/gobex-apparam.h
+++ b/gobex/gobex-apparam.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2012  Intel Corporation.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-debug.h b/gobex/gobex-debug.h
index 14e2bcd..688466e 100644
--- a/gobex/gobex-debug.h
+++ b/gobex/gobex-debug.h
@@ -4,8 +4,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-defs.c b/gobex/gobex-defs.c
index c184c9c..1c7c39a 100644
--- a/gobex/gobex-defs.c
+++ b/gobex/gobex-defs.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-defs.h b/gobex/gobex-defs.h
index 9c2ab53..326e3cb 100644
--- a/gobex/gobex-defs.h
+++ b/gobex/gobex-defs.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c
index 80e8e4e..281f8ea 100644
--- a/gobex/gobex-header.c
+++ b/gobex/gobex-header.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-header.h b/gobex/gobex-header.h
index 196cb20..42a2a0c 100644
--- a/gobex/gobex-header.h
+++ b/gobex/gobex-header.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c
index c3e3953..4c14cf7 100644
--- a/gobex/gobex-packet.c
+++ b/gobex/gobex-packet.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-packet.h b/gobex/gobex-packet.h
index e4cea0b..6121fa7 100644
--- a/gobex/gobex-packet.h
+++ b/gobex/gobex-packet.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index 724c788..ac8836c 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex.c b/gobex/gobex.c
index 7c136af..a9bcee9 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/gobex/gobex.h b/gobex/gobex.h
index 3120da2..c42c42c 100644
--- a/gobex/gobex.h
+++ b/gobex/gobex.h
@@ -5,8 +5,9 @@
  *  Copyright (C) 2011  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of