diff options
| author | Artur Signell <artur@vaadin.com> | 2014-04-16 11:43:58 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-04-16 11:43:59 +0300 |
| commit | 6c022639adfcf2c0b8db52062b32a0479b07ad7d (patch) | |
| tree | 422db4ad54dea49935db1f42c299b0e91f252ce4 /scripts | |
| parent | e3fe34dcd9c3414b5fc96819c68899051346872c (diff) | |
| download | vaadin-framework-6c022639adfcf2c0b8db52062b32a0479b07ad7d.tar.gz vaadin-framework-6c022639adfcf2c0b8db52062b32a0479b07ad7d.zip | |
Merge from 7.1 to 7.2
Merge: no
Change-Id: Ibfe17c35ec72985823389c75a5c3135998443068
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index abc577f6b9..3349d8d622 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -1,8 +1,8 @@ #!/bin/bash IGNORE=7.0 -FROM=7.2 -TO=master +FROM=7.1 +TO=7.2 IGNORE_HEAD=origin/$IGNORE FROM_HEAD=origin/$FROM |