From 1670d1e04b2aebc0a90b6c2e0b9bfe7acdc14dda Mon Sep 17 00:00:00 2001
From: Jerome Guelfucci <jeromeg@xfce.org>
Date: Sun, 14 Jun 2009 12:21:22 +0000
Subject: [PATCH] Merge the AUTHORS and the CONTRIBUTORS files. Update the
 README.

(Old svn revision: 7567)
---
 AUTHORS      |  7 ++++++-
 CONTRIBUTORS | 15 ---------------
 ChangeLog    |  4 ++++
 README       |  7 +++++--
 4 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 CONTRIBUTORS

diff --git a/AUTHORS b/AUTHORS
index 04f1019f..5f3287a8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,10 @@
+Authors:
 Daniel Bobadilla Leal <dbobadil@dcc.uchile.cl>
 Jani Monoses <jani@ubuntu.com> 
 Jérôme Guelfucci <jeromeg@xfce.org>
 
-Icons taken form the Rodent icon theme.
+Contributors:
+David Collins <david.8.collins@gmail.com>
+Enrico Tröger <enrico.troeger@uvena.de>
+Mike Massonnet <mmassonnet@xfce.org>
+Fabrice Viale <viale.fabrice@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
deleted file mode 100644
index aedfa837..00000000
--- a/CONTRIBUTORS
+++ /dev/null
@@ -1,15 +0,0 @@
-David Collins:
-- copy to clipboard functionnality.
-- UI improvements.
-- "select a region" functionnality.
-
-Enrico Tröger:
-- patch to fix a crash.
-- patch to fix the -s CLI option
-
-Mike Massonnet:
-- patch to improve the user interface
-- various advices to improve the user interface
-
-Fabrice Viale:
-- detailed interface review with a lot of advices
diff --git a/ChangeLog b/ChangeLog
index cc654e51..b7809c4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-14 jeromeg
+
+Merge the AUTHORS and the CONTRIBUTORS files. Update the README.
+
 2009-06-14 jeromeg
 
 Optimize the size of the images of the documentation.
diff --git a/README b/README
index 0daf3b2a..0761113a 100644
--- a/README
+++ b/README
@@ -4,10 +4,13 @@ before the screenshot is taken and the action that will be done with
 the screenshot: save it to a PNG file, copy it to the clipboard, or 
 open it using another application.
 
+If activated on build, you can also host your screenshots on ZimageZ, 
+a free online image hosting service. The CURL and XMLRPC-C libraries
+are required.
+
 A plugin for the Xfce panel is also available.
 
 You can grab the development version with subversion by running:
 svn co http://svn.xfce.org/svn/goodies/xfce4-screenshooter/trunk/ xfce4-screenshooter
 
-The documentation is available in the doc/ folder of the source tree and
-on the website: http://goodies.xfce.org/projects/applications/xfce4-screenshooter
+The documentation is available in the doc/ folder of the source tree.
-- 
GitLab