]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 445765f 6ba0085)
Merge commit 'b9b1de7779dcb1d85778b056f5d017acd9d3c5a9' into contrib
authorJens Jansson <peppe@vaadin.com>
Thu, 22 Dec 2011 10:30:38 +0000 (12:30 +0200)
committerJens Jansson <peppe@vaadin.com>
Thu, 22 Dec 2011 10:30:38 +0000 (12:30 +0200)
Conflicts:
src/com/vaadin/data/util/converter/Converter.java
src/com/vaadin/ui/AbsoluteLayout.java


Trivial merge
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework