diff options
| author | David Walter Seikel | 2013-04-26 13:14:20 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-04-26 13:14:20 +1000 |
| commit | 58ee2b1f115c8543f530024e00377805bb87e71e (patch) | |
| tree | 6cea7f8ae4b03bf2b5d247408b0f869c2fda82f8 /linden/scripts/linux/0-patch-SL-source | |
| parent | Update boost library for Linux 64 bit to 1.48 from Kokua. (diff) | |
| parent | Ah, iss has different UUIDs for release and experimentals. (diff) | |
| download | meta-impy-58ee2b1f115c8543f530024e00377805bb87e71e.zip meta-impy-58ee2b1f115c8543f530024e00377805bb87e71e.tar.gz meta-impy-58ee2b1f115c8543f530024e00377805bb87e71e.tar.bz2 meta-impy-58ee2b1f115c8543f530024e00377805bb87e71e.tar.xz | |
Merge branch 'nmake' into next
nmake builds seem stable now.
Diffstat (limited to 'linden/scripts/linux/0-patch-SL-source')
| -rwxr-xr-x | linden/scripts/linux/0-patch-SL-source | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/scripts/linux/0-patch-SL-source b/linden/scripts/linux/0-patch-SL-source index 4885d5d..ce0dabe 100755 --- a/linden/scripts/linux/0-patch-SL-source +++ b/linden/scripts/linux/0-patch-SL-source | |||
| @@ -22,7 +22,7 @@ if [ "$PATCHES" != "" ] ; then | |||
| 22 | elif echo $i | grep ".bz2" &>/dev/null ; then | 22 | elif echo $i | grep ".bz2" &>/dev/null ; then |
| 23 | bzcat $i | patch -p1 -s | 23 | bzcat $i | patch -p1 -s |
| 24 | elif echo $i | grep ".zip" &>/dev/null ; then | 24 | elif echo $i | grep ".zip" &>/dev/null ; then |
| 25 | unzip -o $i >/dev/null | 25 | unzip -o $i >/dev/null |
| 26 | else | 26 | else |
| 27 | patch -p1 -s <$i | 27 | patch -p1 -s <$i |
| 28 | fi | 28 | fi |