diff -r 1c0956b17971 -r 1eb029558431 Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Apr 10 14:48:34 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sat Apr 10 16:09:37 2010 +0000
@@ -630,10 +630,10 @@
menu.addSeparator()
act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"),
self.trUtf8('Revert changes'), self._VCSRevert)
- self.vcsDirMenuActions.append(act)
+ self.vcsDirMultiMenuActions.append(act)
act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"),
self.trUtf8('Merge changes'), self._VCSMerge)
- self.vcsDirMenuActions.append(act)
+ self.vcsDirMultiMenuActions.append(act)
act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve)
self.vcsDirMultiMenuActions.append(act)
menu.addSeparator()
@@ -893,4 +893,4 @@
for itm in items:
if isinstance(itm, ProjectBrowserFileItem):
return True
- return False
\ No newline at end of file
+ return False
