diff options
author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-06-02 17:42:28 +0300 |
---|---|---|
committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-06-02 17:44:01 +0300 |
commit | f861a2dfe4a64e696fe5f70fc7ae4c7c1b1612ef (patch) | |
tree | 45cd6decaaf958aaf94d50b7a6279c174d523007 /shared/src | |
parent | ec54a601dc882333687bcef2b4fa59c02e6c4ede (diff) | |
parent | 4724d89af9228edcb9bbff987255122841c6d33e (diff) | |
download | vaadin-framework-f861a2dfe4a64e696fe5f70fc7ae4c7c1b1612ef.tar.gz vaadin-framework-f861a2dfe4a64e696fe5f70fc7ae4c7c1b1612ef.zip |
Merge remote-tracking branch 'origin/master' into grid-unbuffered-editor
Change-Id: I0a2ed5629eb0598d4049d4cf5ea6e55fe3092c99
Diffstat (limited to 'shared/src')
-rw-r--r-- | shared/src/com/vaadin/shared/util/SharedUtil.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared/src/com/vaadin/shared/util/SharedUtil.java b/shared/src/com/vaadin/shared/util/SharedUtil.java index d363d767be..28c1ea3734 100644 --- a/shared/src/com/vaadin/shared/util/SharedUtil.java +++ b/shared/src/com/vaadin/shared/util/SharedUtil.java @@ -248,7 +248,7 @@ public class SharedUtil implements Serializable { * {@literal foo} becomes {@literal foo} {@literal foo-bar} becomes * {@literal fooBar} {@literal foo--bar} becomes {@literal fooBar} * - * @since + * @since 7.5 * @param dashSeparated * The dash separated string to convert * @return a camelCase version of the input string |