[jnr-posix] 02/12: Merge tag 'upstream/1.1.8'
Tim Potter
tpot-guest at moszumanska.debian.org
Tue Apr 7 04:07:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
tpot-guest pushed a commit to branch master
in repository jnr-posix.
commit 04e14bac44b07c2b5225e33dc58ee67366c6e7b4
Merge: 0fba642 cccc16b
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Tue Aug 28 00:14:35 2012 +0200
Merge tag 'upstream/1.1.8'
Upstream version 1.1.8
Conflicts:
pom.xml
nbproject/build-impl.xml | 410 ++++++++++++++++-----
nbproject/genfiles.properties | 4 +-
pom.xml | 5 +-
src/org/jruby/ext/posix/BaseNativePOSIX.java | 31 ++
src/org/jruby/ext/posix/HeapStruct.java | 4 +-
src/org/jruby/ext/posix/JavaLibCHelper.java | 7 +
src/org/jruby/ext/posix/JavaPOSIX.java | 64 ++++
src/org/jruby/ext/posix/LazyPOSIX.java | 38 +-
src/org/jruby/ext/posix/LibC.java | 108 +++---
src/org/jruby/ext/posix/POSIX.java | 122 +++---
src/org/jruby/ext/posix/POSIXFactory.java | 3 +
src/org/jruby/ext/posix/WindowsChildRecord.java | 30 ++
src/org/jruby/ext/posix/WindowsLibC.java | 43 ++-
.../jruby/ext/posix/WindowsLibCFunctionMapper.java | 5 +-
src/org/jruby/ext/posix/WindowsPOSIX.java | 184 +++++++--
.../jruby/ext/posix/WindowsProcessInformation.java | 33 ++
.../jruby/ext/posix/WindowsSecurityAttributes.java | 28 ++
src/org/jruby/ext/posix/WindowsStartupInfo.java | 51 +++
src/org/jruby/ext/posix/util/Finder.java | 142 +++++++
src/org/jruby/ext/posix/util/Platform.java | 6 +-
src/org/jruby/ext/posix/util/WindowsHelpers.java | 405 ++++++++++++++++++++
.../org/jruby/ext/posix/util/PlatformTest.java | 37 +-
22 files changed, 1529 insertions(+), 231 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jnr-posix.git
More information about the pkg-java-commits
mailing list