From: Ana Isabel Carvalho Date: Wed, 4 Jun 2014 17:27:08 +0000 (+0100) Subject: Merge branch 'master' of vcs.fsf.org:enc X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5ba4291e246229c052a2915c008dbf497d22beb2;p=enc.git Merge branch 'master' of vcs.fsf.org:enc Conflicts: static --- 5ba4291e246229c052a2915c008dbf497d22beb2 diff --cc index.html index 20bb9b14,fc20fb70..6d49b9b0 --- a/index.html +++ b/index.html @@@ -11,8 -11,8 +11,8 @@@ -- -- ++ ++ @@@ -24,7 -24,7 +24,7 @@@
  • Windows