[gnuplot5] 01/05: Fix conflict.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gnuplot5.

commit 355129b3ea3f7dcb0a1fd31a57b7e0e0b7a52ce7
Merge: 69d77fb 094380f
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Apr 28 20:29:46 2015 +0200

    Fix conflict.

 debian/patches/07_doc.patch | 17 +++++++++++++++++
 debian/patches/series       |  1 +
 2 files changed, 18 insertions(+)

diff --cc debian/patches/series
index 2ec82d1,a33d283..0fd963d
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,5 +1,7 @@@
  04_fix_libexecdir.diff
  05_default_gd_font.diff
+ 07_doc.patch
  08_disable_demo_plugin.patch
  09_remove_beos.patch
 +10_removepicins.patch
 +11_fix_linkage_wx.patch

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