diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-04-14 11:53:11 +0300 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-04-14 12:06:05 +0300 |
| commit | 416e2f97bcaf93e4d2a782149a963fca95b8400e (patch) | |
| tree | eac6d22107b7c2d7bf6371e5278078f02bb860e9 /scripts | |
| parent | d2e24feb09ccba7f3a2f253687488774af2bc340 (diff) | |
| parent | eda9edcbde781d29ff5939defb61ba5fb159e206 (diff) | |
| download | vaadin-framework-416e2f97bcaf93e4d2a782149a963fca95b8400e.tar.gz vaadin-framework-416e2f97bcaf93e4d2a782149a963fca95b8400e.zip | |
Merge branch 'master' into 7.2
72d0aa0 Update Window Javadoc based on 7.2 API review changes
ee203f5 Apply abstract ordered layout settings for replaced component (#13568)
02998d8 Updated Window API based on 7.2 API review
cd94b21 Discourage use of setNeedsLayout while a layout is running (#13542)
f374bc7 Make ComboBox always immediate (#4054)
aec102a Update 3rd party license information (#13449)
013d32d Remove old widget from tab content on replace (#12931).
3d0ff32 Prevent duplicate detach() calls with push (#13261)
a452bad Refactor VaadinPortletRequest extending. (#13551)
55dfd29 Prevent duplicate session destroy events (#12612)
2067d4e Don't allocate unnecessary memory for empty array of Objects in MethodProperty (#10446).
00a9af5 Refactor PushConfigurationTest.
Merge: no
Change-Id: I6563769a77f91a68cfeadcb3306dd71fe431863c
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 3349d8d622..abc577f6b9 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -1,8 +1,8 @@ #!/bin/bash IGNORE=7.0 -FROM=7.1 -TO=7.2 +FROM=7.2 +TO=master IGNORE_HEAD=origin/$IGNORE FROM_HEAD=origin/$FROM |