Oops, forgot to credit Ahmad Khalifa of arabeyes.org for the bidi/shaping work.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5612 cda61777-01e9-0310-a592-d414129be87e

diff --git a/LICENCE b/LICENCE
index ca8baad..3e3ca2b 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -2,8 +2,8 @@ PuTTY is copyright 1997-2005 Simon Tatham.
 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
-Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, and
-CORE SDI S.A.
+Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
+Kuhn, and CORE SDI S.A.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files

diff --git a/doc/licence.but b/doc/licence.but
index 91d703c..76ddc80 100644 (file)
--- a/doc/licence.but
+++ b/doc/licence.but
@@ -6,7 +6,8 @@ PuTTY is \i{copyright} 1997-2005 Simon Tatham.
 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
-Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, and CORE SDI S.A.
+Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn,
+and CORE SDI S.A.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files

diff --git a/mac/mac_res.r b/mac/mac_res.r
index 39f6835..a4f615b 100644 (file)
--- a/mac/mac_res.r
+++ b/mac/mac_res.r
@@ -1246,8 +1246,8 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "\n"
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, "
-    "Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, and "
-    "CORE SDI S.A.\n"
+    "Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus "
+    "Kuhn, and CORE SDI S.A.\n"
     "\n"    
     "Permission is hereby granted, free of charge, to any person "
     "obtaining a copy of this software and associated documentation "

diff --git a/mac/macpgen.r b/mac/macpgen.r
index 5a6ed60..7ce9115 100644 (file)
--- a/mac/macpgen.r
+++ b/mac/macpgen.r
@@ -447,8 +447,8 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "\n"
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, "
-    "Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, and "
-    "CORE SDI S.A.\n"
+    "Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus "
+    "Kuhn, and CORE SDI S.A.\n"
     "\n"    
     "Permission is hereby granted, free of charge, to any person "
     "obtaining a copy of this software and associated documentation "

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 9155537..7766129 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -2424,8 +2424,8 @@ static void licence_clicked(GtkButton *button, gpointer data)
 
        "Portions copyright Robert de Bath, Joris van Rantwijk, Delian "
        "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas "
-       "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn, "
-       "and CORE SDI S.A.\n\n"
+       "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, "
+       "Markus Kuhn, and CORE SDI S.A.\n\n"
 
        "Permission is hereby granted, free of charge, to any person "
        "obtaining a copy of this software and associated documentation "

diff --git a/windows/pageant.rc b/windows/pageant.rc
index 29da821..d6aa604 100644 (file)
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@ -58,8 +58,8 @@ BEGIN
 
     LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
     LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
-    LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn,", 1003, 10, 42, 206, 8
-    LTEXT "and CORE SDI S.A.", 1004, 10, 50, 206, 8
+    LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
+    LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
 
     LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
     LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8

diff --git a/windows/puttygen.rc b/windows/puttygen.rc
index 261dbcb..b6ad546 100644 (file)
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -51,8 +51,8 @@ BEGIN
 
     LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
     LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
-    LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn,", 1003, 10, 42, 206, 8
-    LTEXT "and CORE SDI S.A.", 1004, 10, 50, 206, 8
+    LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
+    LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
 
     LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
     LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8

diff --git a/windows/win_res.rc b/windows/win_res.rc
index e34683b..9f56a28 100644 (file)
--- a/windows/win_res.rc
+++ b/windows/win_res.rc
@@ -56,8 +56,8 @@ BEGIN
 
     LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
     LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8
-    LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Markus Kuhn,", 1003, 10, 42, 206, 8
-    LTEXT "and CORE SDI S.A.", 1004, 10, 50, 206, 8
+    LTEXT "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa,", 1003, 10, 42, 206, 8
+    LTEXT "Markus Kuhn, and CORE SDI S.A.", 1004, 10, 50, 206, 8
 
     LTEXT "Permission is hereby granted, free of charge, to any person", 1005, 10, 66, 206, 8
     LTEXT "obtaining a copy of this software and associated documentation", 1006, 10, 74, 206, 8