hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
SiboVG 2023-03-24 12:00:20 +01:00
parent a43d11966d
commit 1d8ba75382
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -565,13 +565,13 @@ public class BasicFrame extends JFrame {
fileMenu.addSeparator(); fileMenu.addSeparator();
JMenu subMenu = new JMenu(trans.get("RocketActions.Select")); JMenu subMenu = new JMenu(trans.get("RocketActions.Select"));
menu.add(subMenu); fileMenu.add(subMenu);
item = new JMenuItem(actions.getSelectSameColorAction()); item = new JMenuItem(actions.getSelectSameColorAction());
subMenu.add(item); subMenu.add(item);
item = new JMenuItem(actions.getDeselectAllAction()); item = new JMenuItem(actions.getDeselectAllAction());
subMenu.add(item); subMenu.add(item);
menu.addSeparator(); fileMenu.addSeparator();
item = new JMenuItem(actions.getScaleAction()); item = new JMenuItem(actions.getScaleAction());
fileMenu.add(item); fileMenu.add(item);