diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-20 13:26:57 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-20 14:53:22 +0300 |
| commit | 1ac972f2bb7d92604a89abf5e08e4343726fbd01 (patch) | |
| tree | 8f213bb97eb2f2abd0d02c0eec1e16871d5bb823 /server/src/com/vaadin/navigator/NavigationStateManager.java | |
| parent | 335eb7937d29c4b540b9bd2e02651e11ff46a6ba (diff) | |
| parent | 13ddd2b03c99b563b131c115982ac09453ca749f (diff) | |
| download | vaadin-framework-1ac972f2bb7d92604a89abf5e08e4343726fbd01.tar.gz vaadin-framework-1ac972f2bb7d92604a89abf5e08e4343726fbd01.zip | |
Merge branch 'master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: Icccb2e30199f99a7b0b00f05b1a12d5f7297402f
Diffstat (limited to 'server/src/com/vaadin/navigator/NavigationStateManager.java')
| -rw-r--r-- | server/src/com/vaadin/navigator/NavigationStateManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/navigator/NavigationStateManager.java b/server/src/com/vaadin/navigator/NavigationStateManager.java index 5b3d3410ea..d454d044cb 100644 --- a/server/src/com/vaadin/navigator/NavigationStateManager.java +++ b/server/src/com/vaadin/navigator/NavigationStateManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 Vaadin Ltd. + * Copyright 2000-2014 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -60,4 +60,4 @@ public interface NavigationStateManager extends Serializable { * This method should only be called by a Navigator. */ public void setNavigator(Navigator navigator); -}
\ No newline at end of file +} |