Merging trunk@r7553 into this branch.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.0@7586 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index 0e83803..9110545 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -1491,3 +1491,7 @@
PopupPanel NPE fix and updated release notes for 2.0.3.
svn merge -c7583,7584 --ignore-ancestry https://google-web-toolkit.googlecode.com/svn/trunk
+trunk@7553 was merged into this branch
+ Trivial fix for issue 3956 ("REGRESSION: r5292 broke Opera support for History")
+ svn merge -c7583,7584 --ignore-ancestry https://google-web-toolkit.googlecode.com/svn/trunk
+
diff --git a/user/src/com/google/gwt/user/History.gwt.xml b/user/src/com/google/gwt/user/History.gwt.xml
index bad06a1..3fd787c 100644
--- a/user/src/com/google/gwt/user/History.gwt.xml
+++ b/user/src/com/google/gwt/user/History.gwt.xml
@@ -30,7 +30,13 @@
</any>
</replace-with>
- <!-- Safari has yet another slightly different implementation. -->
+ <!-- Opera has yet another slightly different implementation. -->
+ <replace-with class="com.google.gwt.user.client.impl.HistoryImplTimer">
+ <when-type-is class="com.google.gwt.user.client.impl.HistoryImpl"/>
+ <when-property-is name="user.agent" value="opera"/>
+ </replace-with>
+
+ <!-- Safari is almost like Opera, but again slightly different. -->
<replace-with class="com.google.gwt.user.client.impl.HistoryImplSafari">
<when-type-is class="com.google.gwt.user.client.impl.HistoryImpl"/>
<when-property-is name="user.agent" value="safari"/>
