Fossil SCM
Merge updates from trunk.
Commit
c40c3272cdde2254e147692b67c40b201bda491ae85689f6857344c51c9b0dc5
Parent
ff735265175830b…
2 files changed
+15
+1
-1
+15
| --- skins/eagle/css.txt | ||
| +++ skins/eagle/css.txt | ||
| @@ -410,5 +410,20 @@ | ||
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | .timelineModernCell[id], .timelineColumnarCell[id], .timelineDetailCell[id] { |
| 413 | 413 | background-color: #455978; |
| 414 | 414 | } |
| 415 | + | |
| 416 | +div.difflncol { | |
| 417 | + padding-right: 1em; | |
| 418 | + text-align: right; | |
| 419 | + color: white; | |
| 420 | +} | |
| 421 | +.capsumOff { | |
| 422 | + background-color: #bbbbbb; | |
| 423 | +} | |
| 424 | +.capsumRead { | |
| 425 | + background-color: #006d00; | |
| 426 | +} | |
| 427 | +.capsumWrite { | |
| 428 | + background-color: #e5e500; | |
| 429 | +} | |
| 415 | 430 |
| --- skins/eagle/css.txt | |
| +++ skins/eagle/css.txt | |
| @@ -410,5 +410,20 @@ | |
| 410 | } |
| 411 | |
| 412 | .timelineModernCell[id], .timelineColumnarCell[id], .timelineDetailCell[id] { |
| 413 | background-color: #455978; |
| 414 | } |
| 415 |
| --- skins/eagle/css.txt | |
| +++ skins/eagle/css.txt | |
| @@ -410,5 +410,20 @@ | |
| 410 | } |
| 411 | |
| 412 | .timelineModernCell[id], .timelineColumnarCell[id], .timelineDetailCell[id] { |
| 413 | background-color: #455978; |
| 414 | } |
| 415 | |
| 416 | div.difflncol { |
| 417 | padding-right: 1em; |
| 418 | text-align: right; |
| 419 | color: white; |
| 420 | } |
| 421 | .capsumOff { |
| 422 | background-color: #bbbbbb; |
| 423 | } |
| 424 | .capsumRead { |
| 425 | background-color: #006d00; |
| 426 | } |
| 427 | .capsumWrite { |
| 428 | background-color: #e5e500; |
| 429 | } |
| 430 |
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1863,11 +1863,11 @@ | ||
| 1863 | 1863 | configSendMask = 0; |
| 1864 | 1864 | syncFlags &= ~(SYNC_PUSH); |
| 1865 | 1865 | zPCode = db_get("parent-project-code", 0); |
| 1866 | 1866 | if( zPCode==0 || db_get("parent-project-name",0)==0 ){ |
| 1867 | 1867 | fossil_fatal("there is no parent project: set the 'parent-project-code'" |
| 1868 | - " and 'parent-project-name' config parameters set in order" | |
| 1868 | + " and 'parent-project-name' config parameters in order" | |
| 1869 | 1869 | " to pull from a parent project"); |
| 1870 | 1870 | } |
| 1871 | 1871 | } |
| 1872 | 1872 | |
| 1873 | 1873 | transport_stats(0, 0, 1); |
| 1874 | 1874 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1863,11 +1863,11 @@ | |
| 1863 | configSendMask = 0; |
| 1864 | syncFlags &= ~(SYNC_PUSH); |
| 1865 | zPCode = db_get("parent-project-code", 0); |
| 1866 | if( zPCode==0 || db_get("parent-project-name",0)==0 ){ |
| 1867 | fossil_fatal("there is no parent project: set the 'parent-project-code'" |
| 1868 | " and 'parent-project-name' config parameters set in order" |
| 1869 | " to pull from a parent project"); |
| 1870 | } |
| 1871 | } |
| 1872 | |
| 1873 | transport_stats(0, 0, 1); |
| 1874 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1863,11 +1863,11 @@ | |
| 1863 | configSendMask = 0; |
| 1864 | syncFlags &= ~(SYNC_PUSH); |
| 1865 | zPCode = db_get("parent-project-code", 0); |
| 1866 | if( zPCode==0 || db_get("parent-project-name",0)==0 ){ |
| 1867 | fossil_fatal("there is no parent project: set the 'parent-project-code'" |
| 1868 | " and 'parent-project-name' config parameters in order" |
| 1869 | " to pull from a parent project"); |
| 1870 | } |
| 1871 | } |
| 1872 | |
| 1873 | transport_stats(0, 0, 1); |
| 1874 |