summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-01-13 15:21:32 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-01-13 15:21:32 -0200
commit438478b28db89ca04fe14867eda509adcc9056bf (patch)
tree9a1f55a0ca9fb1cf47404c8057f0324f6eb0bdeb
parent6d6df8a47e184af29bec44e97eef330d046ec46f (diff)
parent3581143cae6d83ba1801c9c407747f4caad38152 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/iceweasel-libre/PKGBUILD2
-rw-r--r--libre/iceweasel-libre/libre.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 968eeae4e..2998ebae9 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -400,7 +400,7 @@ md5sums=('263569a577f72314694a711cc6a0d96f'
'17bbe91d26b302aa36391ed57199006d'
'de6037c0a65e7b86e0929637156ba587'
'a8fc4658d45b6bf9350023e5c3f34e56'
- '8e582b0be4332519bc6eaf1ed3971499'
+ '25861e760dc41b518cbee9c9194b2b19'
'e4cd438a0b2a42dfb14bc7716e901e5f'
'5bfaf77580b6d3ce185b4c3ad4fa30ca'
'39d8b9249c5effe5fe24d2e9f80a9a94'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 48fe415b5..3a7884316 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -156,8 +156,8 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
#searchText {
diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-18.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-01-04 21:44:28.000000000 -0200
-+++ iceweasel-18.0/browser/locales/en-US/chrome/browser-region/region.properties 2013-01-13 12:42:36.580207667 -0200
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-01-04 21:44:28.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-01-13 12:42:36.580207667 -0200
@@ -10,18 +10,11 @@
browser.search.order.2=Yahoo
browser.search.order.3=Bing