The following commit has been merged in the master branch:
commit 7e18ce9f9188a163ba4418c1f9af036eae3b10bd
Merge: 7af931dfaf054a3e23d8d1696029ad40e61c2e61
4c71a795326f1f67c98be979179717d26ccc25f8
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 10:37:36 2012 +0200
Merge tag
The following commit has been merged in the master branch:
commit 379162ffaf9922c6acc7e04958f6886bfbea45e5
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 14:52:54 2012 +0200
Update control and changelog for the new upstream version
diff --git a/debian/changelog
The following commit has been merged in the master branch:
commit 53a0b723ec708d1019a5d4e56fdb445b167380b0
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 15:12:30 2012 +0200
change my email address in debian/control to the one of my gpg key
diff --git a/debian/control
The following commit has been merged in the master branch:
commit 8a52b24c25147b62634a218f1ebc6b42feb60005
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 15:16:21 2012 +0200
install ocamldoc generated manpages
diff --git a/debian/libeliom-doc.install
The following commit has been merged in the master branch:
commit 0e2af70486a3317ac5c0b697847081311d097d93
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 15:29:07 2012 +0200
build ocamldoc manpages with the 3o section
diff --git
The following commit has been merged in the master branch:
commit 40f2ac123704e74ecfe23ffc7fa9b4057330a94b
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 17:59:58 2012 +0200
Imported Upstream version 2.1.1b
diff --git a/CHANGES b/CHANGES
index 7031f5d..3543f17 100644
---
The following commit has been merged in the master branch:
commit dc449a0c152f35d3e0831fdac079e998c6d752d7
Merge: 0e2af70486a3317ac5c0b697847081311d097d93
40f2ac123704e74ecfe23ffc7fa9b4057330a94b
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 17:59:59 2012 +0200
Merge tag
The following commit has been merged in the master branch:
commit 8845f0b5f92e6eaa1f409a5fe745c7ff92919cf1
Author: Pierre Chambart chamb...@crans.org
Date: Tue Mar 27 18:00:25 2012 +0200
drop patches included upstream
diff --git a/debian/changelog b/debian/changelog
index c959e5b..3c26128
8 matches
Mail list logo
