[pcl] 02/03: Merge branch 'master' of git+ssh://alioth-git/git/debian-science/packages/pcl

[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 pcl.

commit e7443106aff5f5ac6513515d4eff6704a53ad0ee
Merge: 5746d6a 361a799
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Mon Oct 13 00:25:02 2014 +0200

    Merge branch 'master' of git+ssh://alioth-git/git/debian-science/packages/pcl

 debian/control | 2 +-
 debian/rules   | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --cc debian/control
index 098fb62,9fbf23f..1e18d73
--- a/debian/control
+++ b/debian/control
@@@ -22,9 -22,8 +22,9 @@@ Build-Depends: debhelper (>= 9)
  	       libopenni-dev,
  	       libqt4-opengl-dev,
  	       libusb-1.0-0-dev,
 +	       freeglut3-dev, 
  	       libvtk5-qt4-dev
- Standards-Version: 3.9.5
+ Standards-Version: 3.9.6
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pcl.git
  Vcs-Git: git://anonscm.debian.org/debian-science/packages/pcl.git
  Homepage: http://www.pointclouds.org/

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