diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:49:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:50:23 +0100 |
| commit | 75b42f18d886b59dbf3380dd12f39f40005ef08b (patch) | |
| tree | cd1cb5699064fa897f11d9f9f4923c0c0f05d95a /scripts | |
| parent | 43203140461174071f7a3e68bf388a6522556810 (diff) | |
| parent | a6ca348636dd92ab1445cff2286b3293163f5cea (diff) | |
| download | qt-creator-75b42f18d886b59dbf3380dd12f39f40005ef08b.tar.gz | |
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/snapshots/cleanup_snapshots.sh | 2 | ||||
| -rwxr-xr-x | scripts/snapshots/create_nullbyte_snapshots.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/snapshots/cleanup_snapshots.sh b/scripts/snapshots/cleanup_snapshots.sh index db283edd44..3d60dddc67 100755 --- a/scripts/snapshots/cleanup_snapshots.sh +++ b/scripts/snapshots/cleanup_snapshots.sh @@ -83,5 +83,5 @@ exit 0 ## Properly close subshell -) +) exit $? diff --git a/scripts/snapshots/create_nullbyte_snapshots.sh b/scripts/snapshots/create_nullbyte_snapshots.sh index 9099d183d2..33af90ead1 100755 --- a/scripts/snapshots/create_nullbyte_snapshots.sh +++ b/scripts/snapshots/create_nullbyte_snapshots.sh @@ -54,5 +54,5 @@ exit 0 ## Properly close subshell -) +) exit $? |