| Commit message (Collapse) | Author | Age |
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Remove extra newlines from the end of files and add newlines to files
which are missing one.
|
| |
|
| |
|
|\ |
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
README.md
android/build.gradle
android/gradle.properties
android/gradle/wrapper/gradle-wrapper.properties
config/Make.common.rules
config/PropertyNames.xml
cpp/BuildInstructionsLinux.md
cpp/BuildInstructionsOSX.md
cpp/BuildInstructionsWinRT.md
cpp/BuildInstructionsWindows.md
cpp/config/Make.rules
cpp/config/Make.rules.mak
cpp/include/IceUtil/Config.h
cpp/include/Slice/PythonUtil.h
cpp/include/Slice/RubyUtil.h
cpp/include/Slice/Util.h
cpp/src/Ice/DynamicLibrary.cpp
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
cpp/src/Ice/winrt/StreamEndpointI.cpp
cpp/src/IceGrid/IceGridDB.cpp
cpp/src/IceGrid/Util.cpp
cpp/src/IceUtil/FileUtil.cpp
cpp/src/IceUtil/FileUtil.h
cpp/src/Makefile
cpp/src/Slice/Util.cpp
cpp/src/slice2cs/Gen.cpp
cpp/src/slice2freeze/Main.cpp
cpp/src/slice2freezej/Main.cpp
cpp/src/slice2html/Makefile
cpp/src/slice2html/Makefile.mak
cpp/src/slice2java/Main.cpp
cpp/test/Ice/exceptions/AllTests.cpp
cpp/test/Ice/facets/AllTests.cpp
cpp/test/Ice/info/AllTests.cpp
cpp/test/Ice/location/AllTests.cpp
cpp/test/Ice/properties/run.py
cpp/test/Ice/timeout/AllTests.cpp
cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
cpp/test/IceStorm/stress/run.py
cpp/test/TestSuite/10.0/Package.appxmanifest
cpp/test/TestSuite/10.0/TestSuite.vcxproj
cpp/test/TestSuite/10.0/TestSuite.vcxproj.filters
cpp/test/TestSuite/10.0/TestSuite_TemporaryKey.pfx
cpp/test/TestSuite/8.0/TestSuite.vcxproj
cpp/test/TestSuite/8.0/TestSuite_TemporaryKey.pfx
csharp/BuildInstructions.md
csharp/src/Ice/PropertyNames.cs
csharp/src/IceLocatorDiscovery/PluginI.cs
java/BuildInstructions.md
java/Makefile
java/Makefile.mak
java/src/Glacier2/src/main/java/Glacier2/Application.java
java/src/Glacier2/src/main/java/Glacier2/SessionFactoryHelper.java
java/src/Glacier2/src/main/java/Glacier2/SessionHelper.java
java/src/Ice/src/main/java/Ice/Object.java
java/src/Ice/src/main/java/Ice/ObjectImpl.java
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
java/src/Ice/src/main/java/IceSSL/Plugin.java
java/src/Ice/src/main/java/IceSSL/PluginFactory.java
java/src/Ice/src/main/java/IceUtil/Cache.java
java/src/IceGridGUI/build.gradle
java/src/IceGridGUI/src/main/java/IceGridGUI/SimpleInternalFrame.java
java/src/IceGridGUI/src/main/java/IceGridGUI/Utils.java
java/test/build.gradle
java/test/ejb/README.md
js/src/Ice/PropertyNames.js
js/src/Ice/browser/TimerUtil.js
js/src/Ice/browser/WSTransceiver.js
js/test/Common/TestCases.json
js/test/Common/Worker.js
objective-c/include/objc/Ice/Config.h
objective-c/src/Ice/CommunicatorI.mm
php/BuildInstructionsLinuxOSX.md
php/BuildInstructionsWindows.md
php/config/Make.rules.mak.php
php/src/php7/IcePHP.rc
python/BuildInstructionsLinuxOSX.md
python/BuildInstructionsWindows.md
python/Makefile
python/modules/IcePy/Slice.cpp
python/test/Slice/import/run.py
ruby/BuildInstructionsLinuxOSX.md
ruby/BuildInstructionsWindows.md
ruby/config/Make.rules
ruby/src/IceRuby/Slice.cpp
scripts/TestController.py
scripts/TestUtil.py
slice/Ice/Communicator.ice
slice/Ice/Instrumentation.ice
slice/IceLocatorDiscovery/IceLocatorDiscovery.ice
|
| | |
|
| | |
|
| | |
|
| | |
|
|\| |
|
| | |
|
| | |
|
|\| |
|
| | |
|
|/ |
|
| |
|
| |
|
| |
|
|
|
|
| |
distribution
|
|
|
|
|
|
|
| |
Renamed ruby/config/slice2rb.rb to ruby/config/s2rb.rb
Renamed python/config/slice2py.py to python/config/s2py.py
Moved slice2rb and slice2py.py from dist-utils into the scripts
directory for python and ruby.
|
|
|
|
| |
Windows python dev tree build is broken
|
| |
|
|
rb -> ruby
objc -> objective-c
cs -> csharp
|