vaadin-framework.git - Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove the automerge script	Jonatan Kronqvist	2014-05-05	1	-165/+0
*	Merge from 7.1 to 7.2	Artur Signell	2014-04-16	1	-2/+2
*	Merge from 7.2	Artur Signell	2014-04-11	1	-1/+1
*	Email author about merge failures	Artur Signell	2014-02-26	1	-0/+12
*	Use different exit codes for different errors	Artur Signell	2014-02-25	1	-8/+8
*	Fix typo in automerge script	Leif Åstrand	2013-10-04	1	-1/+1
*	Escape \ in commit messages	Leif Åstrand	2013-06-07	1	-1/+1
*	Ignore changes merged from the previous maintenance branch	Leif Åstrand	2013-06-07	1	-1/+3
*	Merge changes from origin/7.1	Leif Åstrand	2013-05-17	1	-3/+23
\|\
\| *	Commit and push everything before a conflicting commit	Leif Åstrand	2013-05-17	1	-3/+23
* \|	Merge changes from origin/7.1	Leif Åstrand	2013-05-10	1	-0/+8
\|\\|
\| *	Don't start merging if there are uncommitted changes	Leif Åstrand	2013-05-06	1	-0/+8
* \|	Update merge specification for the master branch.	Leif Åstrand	2013-05-07	1	-2/+2
\|/
*	Update merge script to merge 7.0 to 7.1	Leif Åstrand	2013-05-06	1	-7/+9
*	Include commit id and message in merge commit message	Artur Signell	2013-04-23	1	-6/+20
*	Ensure no-op merges get a change id	Artur Signell	2013-04-23	1	-1/+4
*	Script for merging changes from a bugfix branch into master (#11299)	Artur Signell	2013-03-12	1	-0/+104