← Back to branch summary

~allison/ubuntu/natty/bsdmainutils/bsdmainutils.allison-natty-merge

« back to all changes in this revision

Viewing changes to debian/patches/column_nomerge.diff

  • Committer: Colin Watson
  • Date: 2010-10-13 11:00:52 UTC
  • mfrom: (2.2.11 sid)
  • Revision ID: cjwatson@canonical.com-20101013110052-7l53xzaim0oyqag9
merge from Debian 8.0.13

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/column_nomerge.diff
 
1
Description: Add nomerge option.
 
2
Author: Michael Meskes <meskes@debian.org>
 
3
 
1
4
--- bsdmainutils/usr.bin/column/column.c.orig   2009-10-26 19:19:42.000000000 +0100
2
5
+++ bsdmainutils/usr.bin/column/column.c        2009-10-26 20:02:25.000000000 +0100
3
6
@@ -69,6 +69,8 @@