]> source.dussan.org Git - vaadin-framework.git/commit
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)
commita2cc4e7a0525c44dbcb5cd0f79dbf6b31a61de64
tree1ee9baee209a07e446d0c010d55c8644f0a899d8
parent445765f58d8e70d4512948ec9d11a351e7ffe346
parent6ba0085215b89fcf3f65e96c78280f1e7cb74b4a
Merge commit 'b9b1de7779dcb1d85778b056f5d017acd9d3c5a9' into contrib

Conflicts:
src/com/vaadin/data/util/converter/Converter.java
src/com/vaadin/ui/AbsoluteLayout.java