diff --git a/CredWrite/CredWrite.rc b/CredWrite/CredWrite.rc
index ea38b9f..ffc2bf6 100644
Binary files a/CredWrite/CredWrite.rc and b/CredWrite/CredWrite.rc differ
diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp
index 57387ee..1035b2b 100644
Binary files a/CredWrite/Main.cpp and b/CredWrite/Main.cpp differ
diff --git a/CredWrite/StdAfx.cpp b/CredWrite/StdAfx.cpp
index d51397c..acfd805 100644
Binary files a/CredWrite/StdAfx.cpp and b/CredWrite/StdAfx.cpp differ
diff --git a/CredWrite/StdAfx.h b/CredWrite/StdAfx.h
index 027561c..6eb48db 100644
Binary files a/CredWrite/StdAfx.h and b/CredWrite/StdAfx.h differ
diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile
index 095c47f..5c19d7e 100644
Binary files a/EAPMethods/MSIBuild/Makefile and b/EAPMethods/MSIBuild/Makefile differ
diff --git a/EAPMethods/build/EAPMethod.def b/EAPMethods/build/EAPMethod.def
index a1f1030..b9a7ec2 100644
Binary files a/EAPMethods/build/EAPMethod.def and b/EAPMethods/build/EAPMethod.def differ
diff --git a/EAPMethods/build/EAPMethodEvents.rc b/EAPMethods/build/EAPMethodEvents.rc
index 844d254..47173b2 100644
Binary files a/EAPMethods/build/EAPMethodEvents.rc and b/EAPMethods/build/EAPMethodEvents.rc differ
diff --git a/EAPMethods/build/EAPMethodUI.def b/EAPMethods/build/EAPMethodUI.def
index 470b9fd..c788ca4 100644
Binary files a/EAPMethods/build/EAPMethodUI.def and b/EAPMethods/build/EAPMethodUI.def differ
diff --git a/EAPMethods/build/EAPTTLS.rc b/EAPMethods/build/EAPTTLS.rc
index 64c3459..8d0ff95 100644
Binary files a/EAPMethods/build/EAPTTLS.rc and b/EAPMethods/build/EAPTTLS.rc differ
diff --git a/EAPMethods/build/EAPTTLSUI.rc b/EAPMethods/build/EAPTTLSUI.rc
index 64b9712..3f533cf 100644
Binary files a/EAPMethods/build/EAPTTLSUI.rc and b/EAPMethods/build/EAPTTLSUI.rc differ
diff --git a/EAPMethods/include/EAPMethods.h b/EAPMethods/include/EAPMethods.h
index 40f2b31..5e02ba1 100644
Binary files a/EAPMethods/include/EAPMethods.h and b/EAPMethods/include/EAPMethods.h differ
diff --git a/EAPMethods/include/EAPTTLS.h b/EAPMethods/include/EAPTTLS.h
index 2d85b23..0a76f19 100644
Binary files a/EAPMethods/include/EAPTTLS.h and b/EAPMethods/include/EAPTTLS.h differ
diff --git a/EAPMethods/include/StdAfx.h b/EAPMethods/include/StdAfx.h
index 793ca00..d97d89b 100644
Binary files a/EAPMethods/include/StdAfx.h and b/EAPMethods/include/StdAfx.h differ
diff --git a/EAPMethods/res/EAPMethodETW.man b/EAPMethods/res/EAPMethodETW.man
index 0bff491..d12a0ae 100644
Binary files a/EAPMethods/res/EAPMethodETW.man and b/EAPMethods/res/EAPMethodETW.man differ
diff --git a/EAPMethods/src/EAPMethods.cpp b/EAPMethods/src/EAPMethods.cpp
index 91a824d..7346028 100644
Binary files a/EAPMethods/src/EAPMethods.cpp and b/EAPMethods/src/EAPMethods.cpp differ
diff --git a/EAPMethods/src/EAPTTLS.cpp b/EAPMethods/src/EAPTTLS.cpp
index c880f79..8583600 100644
Binary files a/EAPMethods/src/EAPTTLS.cpp and b/EAPMethods/src/EAPTTLS.cpp differ
diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp
index e0e5e82..5895f67 100644
Binary files a/EAPMethods/src/Main.cpp and b/EAPMethods/src/Main.cpp differ
diff --git a/EAPMethods/src/MainUI.cpp b/EAPMethods/src/MainUI.cpp
index abf9494..3b7f2ef 100644
Binary files a/EAPMethods/src/MainUI.cpp and b/EAPMethods/src/MainUI.cpp differ
diff --git a/EAPMethods/src/StdAfx.cpp b/EAPMethods/src/StdAfx.cpp
index 5404bab..3b5d959 100644
Binary files a/EAPMethods/src/StdAfx.cpp and b/EAPMethods/src/StdAfx.cpp differ
diff --git a/MSI/Base/Main/Makefile b/MSI/Base/Main/Makefile
index 60a9607..b88ea25 100644
Binary files a/MSI/Base/Main/Makefile and b/MSI/Base/Main/Makefile differ
diff --git a/MSI/Base/Makefile b/MSI/Base/Makefile
index a8dafad..bd7ba7c 100644
Binary files a/MSI/Base/Makefile and b/MSI/Base/Makefile differ
diff --git a/MSI/MSIBuild b/MSI/MSIBuild
index b9c9d6e..74c5814 160000
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@@ -1 +1 @@
-Subproject commit b9c9d6e674e171f885a43c4f90d2baf00dc3adc6
+Subproject commit 74c5814a13782300a2c80f1850ea87da3f9c1bc5
diff --git a/Makefile b/Makefile
index d4b6e9e..e05b4ae 100644
Binary files a/Makefile and b/Makefile differ
diff --git a/include/Common.props b/include/Common.props
index 9759cec..54e4bd8 100644
--- a/include/Common.props
+++ b/include/Common.props
@@ -3,20 +3,20 @@
Copyright 2016 Amebis
Copyright 2016 GÉANT
- This file is part of GEANTLink.
+ This file is part of GÉANTLink.
- GEANTLink is free software: you can redistribute it and/or modify it
+ GÉANTLink is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- GEANTLink is distributed in the hope that it will be useful, but
+ GÉANTLink is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GEANTLink. If not, see .
+ along with GÉANTLink. If not, see .
-->
diff --git a/include/Debug.props b/include/Debug.props
index 1973694..b1dc758 100644
--- a/include/Debug.props
+++ b/include/Debug.props
@@ -3,20 +3,20 @@
Copyright 2016 Amebis
Copyright 2016 GÉANT
- This file is part of GEANTLink.
+ This file is part of GÉANTLink.
- GEANTLink is free software: you can redistribute it and/or modify it
+ GÉANTLink is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- GEANTLink is distributed in the hope that it will be useful, but
+ GÉANTLink is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GEANTLink. If not, see .
+ along with GÉANTLink. If not, see .
-->
diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak
index 595986f..aa4abfb 100644
Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ
diff --git a/include/Release.props b/include/Release.props
index 91d0a43..5d77f10 100644
--- a/include/Release.props
+++ b/include/Release.props
@@ -3,20 +3,20 @@
Copyright 2016 Amebis
Copyright 2016 GÉANT
- This file is part of GEANTLink.
+ This file is part of GÉANTLink.
- GEANTLink is free software: you can redistribute it and/or modify it
+ GÉANTLink is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- GEANTLink is distributed in the hope that it will be useful, but
+ GÉANTLink is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GEANTLink. If not, see .
+ along with GÉANTLink. If not, see .
-->
diff --git a/include/ResourceDLL.props b/include/ResourceDLL.props
index 9db83be..4eae672 100644
--- a/include/ResourceDLL.props
+++ b/include/ResourceDLL.props
@@ -1,4 +1,4 @@
-
+
diff --git a/include/Version.h b/include/Version.h
index 750fe82..c1d331d 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -1,21 +1,26 @@
-/*
+/*
Copyright 2015-2016 Amebis
- Copyright 2016 GÉANT
+ Copyright 2016 GÉANT
- This file is part of GEANTLink.
+ This file is part of GÉANTLink.
- GEANTLink is free software: you can redistribute it and/or modify it
+ GÉANTLink is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- GEANTLink is distributed in the hope that it will be useful, but
+ GÉANTLink is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GEANTLink. If not, see .
+ along with GÉANTLink. If not, see .
+*/
+
+/*
+ NOTE: This file should not be UTF-16 encoded, as the build process
+ uses grep.exe to extract version numbers.
*/
#pragma once
@@ -59,4 +64,4 @@
// Since the product name is not finally confirmed at the time of
// developing it, make it easily customizable.
//
-#define PRODUCT_NAME_STR "GEANTLink"
+#define PRODUCT_NAME_STR "GÉANTLink"
diff --git a/include/Win32.props b/include/Win32.props
index decfb8d..2d273ba 100644
--- a/include/Win32.props
+++ b/include/Win32.props
@@ -3,20 +3,20 @@
Copyright 2016 Amebis
Copyright 2016 GÉANT
- This file is part of GEANTLink.
+ This file is part of GÉANTLink.
- GEANTLink is free software: you can redistribute it and/or modify it
+ GÉANTLink is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- GEANTLink is distributed in the hope that it will be useful, but
+ GÉANTLink is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GEANTLink. If not, see .
+ along with GÉANTLink. If not, see .
-->
diff --git a/include/x64.props b/include/x64.props
index 99f6cf8..3198183 100644
--- a/include/x64.props
+++ b/include/x64.props
@@ -3,20 +3,20 @@
Copyright 2016 Amebis
Copyright 2016 GÉANT
- This file is part of GEANTLink.
+ This file is part of GÉANTLink.
- GEANTLink is free software: you can redistribute it and/or modify it
+ GÉANTLink is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- GEANTLink is distributed in the hope that it will be useful, but
+ GÉANTLink is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GEANTLink. If not, see .
+ along with GÉANTLink. If not, see .
-->
diff --git a/include/xgettext.props b/include/xgettext.props
index 8607dd7..77df9a8 100644
--- a/include/xgettext.props
+++ b/include/xgettext.props
@@ -3,20 +3,20 @@
Copyright 1991-2016 Amebis
Copyright 2016 GÉANT
- This file is part of GEANTLink.
+ This file is part of GÉANTLink.
- GEANTLink is free software: you can redistribute it and/or modify
+ GÉANTLink is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- GEANTLink is distributed in the hope that it will be useful,
+ GÉANTLink is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with GEANTLink. If not, see .
+ along with GÉANTLink. If not, see .
-->
diff --git a/lib/WinStd b/lib/WinStd
index 61a8704..3167ef2 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 61a87046166b363382176f2d42f7efa2871d69a0
+Subproject commit 3167ef22d978b0488b73d3e313121d739367b48c