[glade/wip/inigomartinez/improve-install] remove conflict characters



commit f8204f9c0b931835c3f3bf8ba5b6792e02ac5bd5
Author: albfan <albertofanjul gmail com>
Date:   Mon Jul 22 03:00:57 2019 +0200

    remove conflict characters
    
    it should work with copy: true, but that argument of configuration_file
    do not work with configuration_data() object

 gladeui/glade-previewer.rc.in | 2 +-
 src/glade.rc.in               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gladeui/glade-previewer.rc.in b/gladeui/glade-previewer.rc.in
index 3ec103fa..36ce689d 100644
--- a/gladeui/glade-previewer.rc.in
+++ b/gladeui/glade-previewer.rc.in
@@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO
         VALUE "CompanyName", "The GNOME Foundation"
         VALUE "FileDescription", "Glade Interface Designer 
@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
         VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
-        VALUE "LegalCopyright", "Copyright � 2007 The GNOME Foundation"
+        VALUE "LegalCopyright", "Copyright 2007 The GNOME Foundation"
         VALUE "OriginalFilename", "glade-previewer.exe"
         VALUE "ProductName", "Glade Interface Designer"
         VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
diff --git a/src/glade.rc.in b/src/glade.rc.in
index 6669a2cc..e1d1ab68 100644
--- a/src/glade.rc.in
+++ b/src/glade.rc.in
@@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO
         VALUE "CompanyName", "GNOME Foundation"
         VALUE "FileDescription", "Glade Interface Designer 
@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@"
         VALUE "FileVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"
-        VALUE "LegalCopyright", "Copyright � 2012 The GNOME Foundation"
+        VALUE "LegalCopyright", "Copyright 2012 The GNOME Foundation"
         VALUE "OriginalFilename", "glade.exe"
         VALUE "ProductName", "Glade Interface Designer"
         VALUE "ProductVersion", "@GLADE_MAJOR_VERSION@.@GLADE_MINOR_VERSION@.@GLADE_MICRO_VERSION@.0"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]