[jna: 7/7] Merge remote branch 'origin/el5/master'

Levente Farkas lfarkas at fedoraproject.org
Sat Aug 7 23:16:13 UTC 2010


commit 0ce6de127414ff64ca251d5a505002c227bff41a
Merge: 7e8d09a 503e574
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Sun Aug 8 01:15:58 2010 +0200

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore
    	jna.spec
    	sources

 jna-3.2.4-loadlibrary.patch |  142 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 142 insertions(+), 0 deletions(-)
---


More information about the scm-commits mailing list