diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-26 18:57:25 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-26 18:57:25 +0100 |
| commit | 259debb981a976da83ba1c9b93fb6e9ec1a68fe8 (patch) | |
| tree | 051ac05ea39fafd742c7336f97155dde4304d32d /libre/icecat | |
| parent | 025f5565da8ee014457f56851fca55c36619787c (diff) | |
Remove PKGBUILD-less directories and fix unmerged PKGBUILDs.
Diffstat (limited to 'libre/icecat')
| -rw-r--r-- | libre/icecat/PKGBUILD | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e45da8749..05507bbaa 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -83,11 +83,8 @@ build() { #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" #patch -Np1 -i "$srcdir/firefox-version.patch" -<<<<<<< HEAD [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig -======= ->>>>>>> libre/master # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in |