The following commit has been merged in the master branch:
commit 7bc4914efd896ac2bd85b2acf7d80f4851f8046c
Merge: 9f90e56eddc659848b10b7a5a198a41baa4735dd
3bff28956bff8b7a981aea3d6a73520c758eb968
Author: Felix Natter
Date: Sat Oct 12 09:29:33 2013 +0200
Merge tag 'upstream/1.02+dfsg1'
The following commit has been merged in the master branch:
commit 613fff0333fc9fd4605397f8def0451d65c436d7
Author: Felix Natter
Date: Sat Oct 12 09:51:03 2013 +0200
update debian/copyright
diff --git a/debian/copyright b/debian/copyright
index 9754e9d..eb0e86a 100644
--- a/debian/copyright
The following commit has been merged in the master branch:
commit 9f90e56eddc659848b10b7a5a198a41baa4735dd
Author: Felix Natter
Date: Sat Oct 12 09:25:25 2013 +0200
fix debian/watch for 1.02 (thanks to Bart Martens)
diff --git a/debian/watch b/debian/watch
index 2a1835f..1daabeb 100644
---
The following commit has been merged in the master branch:
commit 7e7497287cad90556ed668837d017b5ed44b980b
Author: Felix Natter
Date: Sat Oct 12 09:54:35 2013 +0200
put 'unstable' in changelog
diff --git a/debian/changelog b/debian/changelog
index 69e7e0f..b753ec9 100644
--- a/debian/chang
The following commit has been merged in the master branch:
commit 64ae0c60ed2818a71f28f63c0b16d07985634a53
Author: Felix Natter
Date: Sat Oct 12 09:46:54 2013 +0200
import 1.02, remove patches that have been applied upstream
diff --git a/debian/changelog b/debian/changelog
index 8137b5c..6
The following commit has been merged in the master branch:
commit 3bff28956bff8b7a981aea3d6a73520c758eb968
Author: Felix Natter
Date: Sat Oct 12 09:29:32 2013 +0200
Imported Upstream version 1.02+dfsg1
diff --git a/build.xml b/build.xml
index 234f438..a164e74 100644
--- a/build.xml
+++ b/b
The following commit has been merged in the master branch:
commit 41d21f066a98ed800f35c3cecb94d18e32652f08
Author: Felix Natter
Date: Sat Oct 12 09:58:48 2013 +0200
update version in man page
diff --git a/debian/jmapviewer.1.xml b/debian/jmapviewer.1.xml
index fc4b6d1..01d0aff 100644
--- a
