| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I32625901ca27a282253df44c6e776cf9632bacda
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The merge script was faulty between May and June 2013 and merged changes
individually from both 7.0 and 7.1 to master. In the case that a commit from
7.0 was merged right before there was a "Merge: no" commit in 7.1, the changes
between the "Merge: no" commit and the previous merge point from 7.1 to master was
potentially never merged (the whole chain was merged as a no-op).
The only affected change seems to be
0a437a5 Revert "Replaced css inject hack in TestUtils with Page.Styles.add() #11798"
b008768 Implement parenthesis-handling fixes for Sass in Vaadin 7.1 (#12834)
The former one is re-applied in this commit, the latter one has been verified to be in
the master branch
Change-Id: If0cd75d75fdfc8893ac501aab2a0be1b55b09dcc
|
|
|
|
| |
Change-Id: Ifb43fd1d2226756e104e2f5955e23151100e9357
|
|
|
|
|
|
|
|
|
|
|
| |
svn changeset:25664/svn branch:6.8
Conflicts:
client/src/com/vaadin/client/ApplicationConnection.java
uitest/src/com/vaadin/tests/performance/BasicPerformanceTest.java
uitest/src/com/vaadin/tests/util/TestUtils.java
Change-Id: I699e7b47ad5a62b67dbdf1004da5e5daf009ba25
|
|
|
|
| |
Change-Id: Ic20e3849f0e51d6857ca04952f621a976d1c9a14
|
|
|