Skip to content
Snippets Groups Projects
Commit 9598fe93 authored by Damian Minkov's avatar Damian Minkov
Browse files

Merge branch 'deb-src-release-593' 

Conflicts:
	resources/install/build-debian.xml
	resources/install/debian/copyright
	resources/install/debian/patches/sdes4j.patch
parents bc2892ce 3fbf68af
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 95 additions and 63 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment