]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch 'master' into rpc
authorHenri Sara <hesara@vaadin.com>
Sun, 19 Feb 2012 10:04:42 +0000 (12:04 +0200)
committerHenri Sara <hesara@vaadin.com>
Sun, 19 Feb 2012 10:04:42 +0000 (12:04 +0200)
commit1faaa184dc8fbcd551049c78e420a7cfff0ede0e
tree99a5424cab7b56e0e3d13dbde664c83ae53a4329
parentbc8914066b68e1938ac63606f205672d688be0f1
parente7792742a7bc1e13ceeffb9561f32d9bc01338b2
Merge branch 'master' into rpc

Conflicts:
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml
src/com/vaadin/terminal/gwt/client/Util.java
src/com/vaadin/terminal/gwt/client/VPaintableMap.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java