]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f4ac02 6505282)
Merge commit '65052825df68c109d290bb12ca28b18a2ea613fe' into master
authorJonatan Kronqvist <jonatan@vaadin.com>
Mon, 10 Feb 2014 11:39:51 +0000 (13:39 +0200)
committerJonatan Kronqvist <jonatan@vaadin.com>
Mon, 10 Feb 2014 11:39:51 +0000 (13:39 +0200)
6505282 Fix typo (#11186)

Conflicts:
server/src/com/vaadin/annotations/Widgetset.java

Change-Id: Ibc49522651b1063baefc0010f7429f2b95a261ab


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