Merge branch 'deb-src-release-593'
Conflicts: resources/install/build-debian.xml resources/install/debian/copyright resources/install/debian/patches/sdes4j.patch
No related branches found
No related tags found
Showing
- resources/install/build-debian.xml 20 additions, 8 deletionsresources/install/build-debian.xml
- resources/install/debian/README.embedded-libraries 2 additions, 0 deletionsresources/install/debian/README.embedded-libraries
- resources/install/debian/copyright 60 additions, 41 deletionsresources/install/debian/copyright
- resources/install/debian/patches/remove-gsm 1 addition, 0 deletionsresources/install/debian/patches/remove-gsm
- resources/install/debian/patches/sdes4j.patch 9 additions, 9 deletionsresources/install/debian/patches/sdes4j.patch
- resources/install/debian/watch 1 addition, 2 deletionsresources/install/debian/watch
- src/native/build.xml 2 additions, 3 deletionssrc/native/build.xml
Please register or sign in to comment