[ompl] 01/06: Solving conflictive files

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository ompl.

commit 2c1a54e2d170307caa4010128ba14b44cb0a85b1
Author: Leopold Palomo <leopold.palomo at upc.edu>
Date:   Wed May 28 10:43:09 2014 +0200

    Solving conflictive files
---
 debian/copyright | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 5b87d0c..847b3f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Mark Moll <mmoll at rice.edu>, Ioan Sucan <isucan at gmail.com>
 Source: http://ompl.kavrakilab.org/
 
 Files: *
-Copyright: 2010-2013 Ioan Sucan <isucan at gmail.com>
+Copyright: 2010-2014 Ioan Sucan <isucan at gmail.com>
 		     Mark Moll <mmoll at rice.edu>
                      Lydia E. Kavraki <kavraki at cs.rice.edu>
 License: BSD-3-clause
@@ -36,7 +36,7 @@ License: BSD-3-clause
 
 
 Files: debian/*
-Copyright: 2013 Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Copyright: 2013-2014 Leopold Palomo-Avellaneda <leo at alaxarxa.net>
 License: GPL-2
  See `/usr/share/common-licenses/GPL-2'.
 
@@ -45,7 +45,7 @@ Copyright: 2012 Twitter, Inc
 License: Licensed under the Apache License v2.0
  See `/usr/share/common-licenses/Apache-2.0'.
 
-Files: src\external\omplext_odeint\boost\*
+Files: src/external/omplext_odeint/boost/*
 Copyright: 2009-2011 Karsten Ahnert
 	   2009-2011 Mario Mulansky
 License: Distributed under the Boost Software License, Version 1.0.
@@ -56,10 +56,11 @@ Copyright: Copyright 2011 JetBrains s.r.o.
 License: Licensed under the Apache License v2.0
  See `/usr/share/common-licenses/Apache-2.0'.
 
-Files:  doc/js/gen_validatorv31.js
-	py-bindings/py_boost_function.hpp
-	tests/*.sh
-License: Unlicensed
+Files: test/*
+Copyright: 2010-2014 Ioan Sucan <isucan at gmail.com>
+                     Mark Moll <mmoll at rice.edu>
+                     Lydia E. Kavraki <kavraki at cs.rice.edu>
+License: BSD-3-clause
 
 Files:  doc/php/captcha_code_file.php
 License: GPL

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