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/BuildInstructions.md | |
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/BuildInstructions.md')
-rw-r--r-- | java/BuildInstructions.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md index 4d1892733d4..10c9f137637 100644 --- a/java/BuildInstructions.md +++ b/java/BuildInstructions.md @@ -8,7 +8,7 @@ platforms. ### Operating Systems -Ice for Java is expected to build and run properly on Windows, OS X, and any +Ice for Java is expected to build and run properly on Windows, macOS, and any recent Linux distribution for x86 and x86_64, and was extensively tested using the operating systems and compiler versions listed for our [supported platforms][2]. Due to the portability of Java, it is very likely that it will |