The following commit has been merged in the master branch:
commit 22e27302f7d1da68a819c83ce20aedc5aabae455
Merge: dd9593d481776d795ee758ccda41b2cdf804a1f0
9be9506d37962ff2f389a28b443320da251eb5fd
Author: Andrew Ross <[email protected]>
Date: Sun Jul 22 22:38:05 2012 +0100
Merge tag 'upstream/3.4.1'
Upstream version 3.4.1
Conflicts:
build.xml
contrib/platform/src/com/sun/jna/platform/win32/Advapi32.java
contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java
contrib/platform/src/com/sun/jna/platform/win32/Kernel32.java
contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java
contrib/platform/src/com/sun/jna/platform/win32/Netapi32Util.java
contrib/platform/src/com/sun/jna/platform/win32/WinBase.java
contrib/platform/src/com/sun/jna/platform/win32/WinNT.java
contrib/platform/src/com/sun/jna/platform/win32/Winspool.java
contrib/platform/src/com/sun/jna/platform/win32/WinspoolUtil.java
contrib/platform/src/com/sun/jna/platform/win32/Winsvc.java
contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java
contrib/platform/test/com/sun/jna/platform/win32/Kernel32Test.java
native/Makefile
native/dispatch.c
native/dispatch.h
pom-jna.xml
src/com/sun/jna/Memory.java
src/com/sun/jna/Native.java
src/com/sun/jna/NativeLibrary.java
src/com/sun/jna/Structure.java
test/com/sun/jna/DirectTest.java
test/com/sun/jna/StructureTest.java
--
Packaging for libjna-java a library for dynamic access of native libraries from
Java without JNI
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
