diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-05-05 11:41:09 +0300 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-05-05 11:43:28 +0300 |
| commit | 0745a29a958950b47dbc178d2c3f8c1f38c2af55 (patch) | |
| tree | 8ee16701bec4b37e7a0601ec6bae97f34052bea1 /server/src/com/vaadin/navigator/NavigationStateManager.java | |
| parent | 2efe580cb8dbd185fc154a7c7d6acb7efc4f16d5 (diff) | |
| parent | 2c8c29e68b002ac6c498c3046a41822111c6d4ab (diff) | |
| download | vaadin-framework-0745a29a958950b47dbc178d2c3f8c1f38c2af55.tar.gz vaadin-framework-0745a29a958950b47dbc178d2c3f8c1f38c2af55.zip | |
Merge changes from origin/7.2 into master
Conflicts:
build.properties
client/src/com/vaadin/client/ApplicationConnection.java
client/src/com/vaadin/client/extensions/ResponsiveConnector.java
server/src/com/vaadin/server/Responsive.java
Change-Id: I49f90521611d1b86704a60c3d003cdeea9c3b864
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 +} |