[opticalraytracer] 06/06: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/opticalraytracer

[D Haley]

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

mycae-guest pushed a commit to branch master
in repository opticalraytracer.

commit 3021c78840924399a85568e53aa53038db926874
Merge: 7a2d6d8 e62578b
Author: D Haley <mycae at gmx.com>
Date:   Fri May 15 00:54:32 2015 +0200

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/opticalraytracer
    
    Conflicts:
    	debian/changelog

 debian/changelog | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index cc3e27a,aa16a29..a61e3cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,15 @@@
 +opticalraytracer (9.0-1) unstable; urgency=medium
 +
 +  * Update to upstream 9.0
 +
 + -- D Haley <mycae at gmx.com>  Fri, 15 May 2015 00:15:20 +0200
 +
- opticalraytracer (3.2-2) unstable; urgency=low
+ opticalraytracer (3.2-2) experimental; urgency=low
  
-   * Fix missing desktop file (Closes: #697899)
-   * Update Standards Version to 3.9.4 (bump only)
-   * Fix lintian warnings
+   * Fix missing desktop file. (Closes: #697899)
+   * Update Standards Version to 3.9.4 (bump only).
+   * Fix lintian warnings.
+   * Remove DM upload allowed flag.
  
   -- D Haley <mycae at gmx.com>  Thu, 31 Jan 2013 20:34:13 +0000
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opticalraytracer.git