diff options
author | Artur Signell <artur@vaadin.com> | 2013-03-11 16:06:32 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2013-03-12 12:56:53 +0200 |
commit | 1853dea1b9277f2d5a8911bd2d20277158e221b7 (patch) | |
tree | 73b3f914b6c5bda9017370ef7b374556b538d0c5 /uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml | |
parent | 06748244ae0ebd8f43742a2c0b3349794b169b45 (diff) | |
download | vaadin-framework-1853dea1b9277f2d5a8911bd2d20277158e221b7.tar.gz vaadin-framework-1853dea1b9277f2d5a8911bd2d20277158e221b7.zip |
Script for merging changes from a bugfix branch into master (#11299)
* Supports "Merge: no" for changesets which should be skipped, e.g. release notes updates.
* Supports "Merge: manual" which will causes the merge to stop, requiring somebody to manually merge to change before continuing
Change-Id: If5d1291ec77f4c1e31b3afb8420a45ecceedfa15
Diffstat (limited to 'uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml')
0 files changed, 0 insertions, 0 deletions