]> source.dussan.org Git - vaadin-framework.git/commit
Merge branch '6.8'
authorJohannes Dahlström <johannesd@vaadin.com>
Tue, 24 Jul 2012 12:04:49 +0000 (15:04 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Tue, 24 Jul 2012 12:04:49 +0000 (15:04 +0300)
commit52d8abf71b94fdc717d55bfdf2e2fa0fc29760a2
tree43db695d51811c9205fefc4a14c3afa7ded87641
parent0bac9d1a5616a181806a7cfa34ed2dadbba92fa9
parentb6ea64e917b69a80bd61c0541947fee8faf0e46c
Merge branch '6.8'

Conflicts:
WebContent/VAADIN/themes/base/treetable/treetable.css
WebContent/release-notes.html
src/com/vaadin/terminal/gwt/client/VUIDLBrowser.java
src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java
WebContent/VAADIN/themes/base/table/table.css
WebContent/VAADIN/themes/base/treetable/treetable.css
WebContent/VAADIN/themes/reindeer/table/table.css
src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java
src/com/vaadin/terminal/gwt/client/ui/treetable/VTreeTable.java
src/com/vaadin/ui/Table.java
tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java