[Libreoffice-commits] .: 2 commits - dictionaries helpcontent2 translations

[Libreoffice Gerrit user]

 dictionaries |    2 +-
 helpcontent2 |    2 +-
 translations |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit abcff79a15e39add5f89512984980ee0f3821b68
Author: Andras Timar <atimar at suse.com>
Date:   Tue Jan 8 17:06:46 2013 +0100

    require .NET 4.0
    
    Change-Id: Ia6e3acf563a9c04bf9a2ff5f3f755eb4e92e771c

diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 52f3e34..56f4ba5d 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,7 +399,7 @@ sub set_important_properties
     }
 
     # Setting .NET requirements
-    push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "2.0.0.0" . "\n";
+    push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "4.0.0.0" . "\n";
     push @{$propertyfile}, "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default value for found .NET
 }
 
commit 23be19789c80b4236a21ccf090342ae47c832dc9
Author: Andras Timar <atimar at suse.com>
Date:   Tue Jan 8 16:48:45 2013 +0100

    Revert "require .NET 4.0"
    
    This reverts commit 9dc3ee9a68749bb30536dbe767384d59827dee3d.

diff --git a/dictionaries b/dictionaries
index 7e895dc..d047a0f 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 7e895dc439c87d229b7396076fdd8945b3b51f3f
+Subproject commit d047a0fa0746ce527720d15a36907e52dc67bf47
diff --git a/helpcontent2 b/helpcontent2
index d9d28eb..d5d84f0 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d9d28ebb575e96e742d6590a28dd59c62b89dc4e
+Subproject commit d5d84f0ec4584e32147eeab355d0ab73e7dd9172
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 56f4ba5d..52f3e34 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,7 +399,7 @@ sub set_important_properties
     }
 
     # Setting .NET requirements
-    push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "4.0.0.0" . "\n";
+    push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "2.0.0.0" . "\n";
     push @{$propertyfile}, "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default value for found .NET
 }
 
diff --git a/translations b/translations
index 85f724f..e5f69f7 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 85f724f5aa1d6a59662a7d1c7ea406a641814bd2
+Subproject commit e5f69f7b241f21f0b85f7a62ccff9de841875828