Overview
| Comment: | Merge of v1.55 into v1.60 but too many conflicts, saving on branch confict-merge-v1.60 |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | confict-merge-v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
70e753f237721b21969a5a8012be0bc7 |
| User & Date: | matt on 2014-03-30 01:07:57.265 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-03-30
| ||
| 01:07 | Merge of v1.55 into v1.60 but too many conflicts, saving on branch confict-merge-v1.60 Closed-Leaf check-in: 70e753f237 user: matt tags: confict-merge-v1.60 | |
|
2014-03-29
| ||
| 19:11 | Increased retries in client:start to 100, minor edits? check-in: 18d165c8c7 user: matt tags: v1.60 | |
| 13:31 | Improved an error message check-in: aa13991ded user: matt tags: v1.55 | |
Changes
Modified Makefile
from [ed1f2297ca]
to [e9add66050].
[diff]
Modified common.scm
from [f2071ae50f]
to [c74c09ea7d].
[diff]
Modified common_records.scm
from [8d360e8ca7]
to [785b03b237].
[diff]
Modified dashboard.scm
from [289eaba234]
to [f68dd2fe09].
[diff]
Modified db.scm
from [82609fed05]
to [0253d08df7].
[diff]
Modified launch.scm
from [59d0d6772c]
to [108aa8951e].
[diff]
Modified megatest.scm
from [f4ec5dd5d1]
to [5f5a87a965].
[diff]
Modified runconfig.scm
from [4e3a96ccb1]
to [d97360c67a].
[diff]
Modified runs.scm
from [88c42814b9]
to [c22e67eca1].
[diff]
Modified tests.scm
from [6b6e58b833]
to [2b62908fb8].
[diff]
Modified tests/Makefile
from [6a1442238d]
to [6898a8bdcb].
[diff]
Modified tests/tests.scm
from [a780d57ffe]
to [ceeda9f906].
[diff]