The following commit has been merged in the master branch:
commit d51120cf867e909abf8b0bf46f0b159f48eae141
Merge: ff45acfa4a5868dc6826318c08de673cef6ab1fe
ee107181cbc48db1fcc0ab6cc3164b6a2a331c9a
Author: Giovanni Mascellani
Date: Sat Aug 6 22:49:13 2011 +0200
Merge commit 'upstream/0.0.svn
The following commit has been merged in the master branch:
commit 703c31fe6cf6a6d800984b528bd40aee4db6b949
Author: Giovanni Mascellani
Date: Sat Aug 6 22:51:41 2011 +0200
New changelog stanza.
diff --git a/debian/changelog b/debian/changelog
index e38f842..1b62161 100644
--- a/debian/chang
The following commit has been merged in the pristine-tar branch:
commit 0ef7ee975edaf5a95df163afac8eb81670faa98d
Author: Giovanni Mascellani
Date: Sat Aug 6 22:49:13 2011 +0200
pristine-tar data for josm_0.0.svn4279.orig.tar.gz
diff --git a/josm_0.0.svn4279.orig.tar.gz.delta
b/josm_0.0.sv
The following commit has been merged in the master branch:
commit 8b8ea6bbee4401939ead03ac8196c68a894d29e0
Author: Giovanni Mascellani
Date: Sun Aug 7 11:24:30 2011 +0200
Patches updated.
diff --git a/debian/changelog b/debian/changelog
index 1b62161..af1f5dd 100644
--- a/debian/changelog
The following commit has been merged in the master branch:
commit b73aa68371451b8c99c2ee99a7de77679e5bb7a0
Author: Giovanni Mascellani
Date: Sun Aug 7 12:03:49 2011 +0200
Fix javacc execution and i18n targets.
diff --git a/debian/control b/debian/control
index 7972d58..596947b 100644
--- a
The following commit has been merged in the master branch:
commit 5b88ab13c1e1a0ea180d0e887d4b642b1e017390
Author: Giovanni Mascellani
Date: Mon Aug 8 00:23:55 2011 +0200
Excluding duplicated code from compilation.
diff --git a/debian/control b/debian/control
index 596947b..6ba2e55 100644
The following commit has been merged in the master branch:
commit 3d3dbac3b14847a85690dba26df9f229a3847eb0
Author: Giovanni Mascellani
Date: Mon Aug 8 01:01:02 2011 +0200
Fixing get-orig-source.
diff --git a/debian/rules b/debian/rules
index 3e39bb3..1bb1b60 100755
--- a/debian/rules
+++ b
The following commit has been merged in the master branch:
commit 4b6e8e3c6e9589dda59f502b08e33995ebe91f73
Author: Giovanni Mascellani
Date: Mon Aug 8 00:45:38 2011 +0200
Classpath used in compilation.
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 5ee2d68
The following commit has been merged in the master branch:
commit a5f45be2bc5f33ec4b939ab9cbae6868d686dec0
Author: Giovanni Mascellani
Date: Sun Aug 7 14:47:20 2011 +0200
Patches descriptions improved.
diff --git a/debian/changelog b/debian/changelog
index af1f5dd..a5fe46a 100644
--- a/deb
The following commit has been merged in the master branch:
commit f30d26218dba7feb07357d2872fb8d22f69d2cd7
Merge: 3d3dbac3b14847a85690dba26df9f229a3847eb0
bdec75c50bfbb571f53a1163976ab2dfb04e710d
Author: Giovanni Mascellani
Date: Mon Aug 8 01:04:58 2011 +0200
Merge commit 'upstream/0.0.svn
The following commit has been merged in the pristine-tar branch:
commit 9448e812b1249f8dac345ba8ef412ea8a0ce2c93
Author: Giovanni Mascellani
Date: Mon Aug 8 01:04:57 2011 +0200
pristine-tar data for josm_0.0.svn4279.orig.tar.gz
diff --git a/josm_0.0.svn4279.orig.tar.gz.delta
b/josm_0.0.sv
11 matches
Mail list logo
