]> source.dussan.org Git - vaadin-framework.git/commit
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)
commitb84950314902c4b34f5dda0e97410624a79f3135
treeafcb8307b5739fbf66c82117a7af29dc564c0481
parent4f4ac0276b999d22a6e6b57d6073d6a643dd8c66
parent65052825df68c109d290bb12ca28b18a2ea613fe
Merge commit '65052825df68c109d290bb12ca28b18a2ea613fe' into master

6505282 Fix typo (#11186)

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

Change-Id: Ibc49522651b1063baefc0010f7429f2b95a261ab