]> source.dussan.org Git - vaadin-framework.git/commit
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Thu, 26 Jul 2012 11:53:59 +0000 (14:53 +0300)
committerLeif Åstrand <leif@vaadin.com>
Thu, 26 Jul 2012 11:53:59 +0000 (14:53 +0300)
commit6455d8a5f809c98d93f6bfe89fbe55a64c66a03f
tree1f431716f3d581d33983fd2b788eb91d42a8ac95
parentdf430157bf12ae88e265318c09250a3865981a0c
parentca9fab0922d9db510c51f2d363b46577f7f6c0c4
Merge remote branch 'origin/6.8'

Conflicts:
src/com/vaadin/terminal/gwt/server/CommunicationManager.java
src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
src/com/vaadin/terminal/gwt/server/CommunicationManager.java