Overview
| Comment: | Fixed merge conflict |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 |
| Files: | files | file ages | folders |
| SHA1: |
a533b6fa408fd80356242171e2f827a4 |
| User & Date: | jmoon18 on 2017-10-09 18:42:24 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-10-17
| ||
| 14:16 | fix to append contour to use from fields runs table if it exist check-in: 170a77e923 user: pjhatwal tags: v1.65 | |
| 05:27 | Merged v1.65 check-in: 58e34dfa87 user: matt tags: v1.65-runarun | |
|
2017-10-09
| ||
| 18:42 | Fixed merge conflict check-in: a533b6fa40 user: jmoon18 tags: v1.65 | |
| 15:19 | fixed pgdb sync to skip deleted runs if they were not added to pgdb in prior sync check-in: 0ae58081ef user: pjhatwal tags: v1.65 | |
Changes
Modified utils/installall.sh from [c5681b62d5] to [99b5ab2b11].
| ︙ | ︙ | |||
35 36 37 38 39 40 41 | echo You are using PREFIX=$PREFIX echo You are using proxy="$proxy" echo echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :" SYSTEM_TYPE=$(lsb_release -irs |tr ' ' '_' |tr '\n' '-')$(uname -i)-$OPTION | | | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | echo You are using PREFIX=$PREFIX echo You are using proxy="$proxy" echo echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :" SYSTEM_TYPE=$(lsb_release -irs |tr ' ' '_' |tr '\n' '-')$(uname -i)-$OPTION CHICKEN_VERSION=4.10.0 CHICKEN_BASEVER=4.10.0 # Set up variables # case $SYSTEM_TYPE in Ubuntu-17.04-x86_64-std) KTYPE=32 CDVER=5.11.1 |
| ︙ | ︙ |