diff options
| author | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-03-28 10:25:16 -0400 |
| commit | 7f80ea0db36533c25ffacfccb05a4b8ee657a95f (patch) | |
| tree | 7b619b723fa94ac7996ca9578eae3fbf40f4cc9e /java/src | |
| parent | ICE-7707 Improved handling of argc/argv arguments (diff) | |
| parent | ICE-7483 - Rename OS X to macOS (diff) | |
| download | ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.bz2 ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.tar.xz ice-7f80ea0db36533c25ffacfccb05a4b8ee657a95f.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java index 39abd6906a4..29137d04c51 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Main.java @@ -29,7 +29,7 @@ public class Main extends JFrame // try { - if(System.getProperty("os.name").startsWith("Mac OS")) // OS X L&F + if(System.getProperty("os.name").startsWith("Mac OS")) // macOS L&F { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } |