[gazebo] 01/01: Missing file in merge

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch dfsg_clean
in repository gazebo.

commit 2d75bbdd7320ad79960fe7366fa30a1b90b640d8
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Feb 2 17:47:58 2015 +0100

    Missing file in merge
---
 tools/gzprop.1.ronn | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tools/gzprop.1.ronn b/tools/gzprop.1.ronn
new file mode 100644
index 0000000..aa31f7b
--- /dev/null
+++ b/tools/gzprop.1.ronn
@@ -0,0 +1,27 @@
+gzprop -- Package a model for thepropshop.org
+=============================================
+
+## SYNOPSIS
+
+`gzprop` <model_directory>
+
+## DESCRIPTION
+
+Package an existing model directory into a tarball suitable for upload to thepropshop.org. A working instance of Gazebo >= 3.0 is required.
+
+## OPTIONS
+
+* -h, --help :
+ Output this help message.
+
+## SEE ALSO
+  ThePropShop website: http://thepropshop.org
+
+## AUTHOR
+  Open Source Robotics Foundation
+
+## COPYRIGHT 
+  Copyright (C) 2012-2015 Open Source Robotics Foundation
+       
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.

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