diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-27 12:40:41 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-27 12:40:41 +0300 |
| commit | a67ca492c18451c0f286e90b3a5fb34bde2d3c47 (patch) | |
| tree | 77f8879242385bfa6f970bfb129531dd32ce242a /build/VERSION.properties | |
| parent | c8cee295021dcd33982217e3ad1c374bfca63a29 (diff) | |
| parent | fc3f7f62b05ae69b242d64084f676d7733962c60 (diff) | |
| download | vaadin-framework-a67ca492c18451c0f286e90b3a5fb34bde2d3c47.tar.gz vaadin-framework-a67ca492c18451c0f286e90b3a5fb34bde2d3c47.zip | |
Merge branch 'master' into root-cleanup
Rename Root -> UI in root cleanup code
Conflicts:
client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java
server/src/com/vaadin/ui/UI.java
Diffstat (limited to 'build/VERSION.properties')
0 files changed, 0 insertions, 0 deletions