[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 04/04: Merge branch 'experimental'

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/5.0.2-1
in repository virtualbox-guest-additions-iso.

commit f574e8d5f177749dfff4294efa13ee5f1fab7cf3
Merge: fb2f045 2fc68ce
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Aug 14 19:11:16 2015 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog

 ...ions_4.3.30.iso => VBoxGuestAdditions_5.0.2.iso | Bin 58257408 -> 58716160 bytes
 debian/changelog                                   |  13 +++++++++++++
 debian/control                                     |   2 +-
 debian/copyright                                   |   2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 3e94eb3,af82cf4..b15d7dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,16 +1,16 @@@
 -virtualbox-guest-additions-iso (5.0.2-1) UNRELEASED; urgency=medium
++virtualbox-guest-additions-iso (5.0.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Update my uid.
+ 
+  -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 14 Aug 2015 15:14:05 +0200
+ 
+ virtualbox-guest-additions-iso (5.0.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 15 Jul 2015 12:23:25 +0200
+ 
  virtualbox-guest-additions-iso (4.3.30-1) unstable; urgency=medium
  
    * New upstream release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox-guest-additions-iso.git