← Back to branch summary

~peter-pearse/ubuntu/oneiric/xorg-server/prop001

« back to all changes in this revision

Viewing changes to debian/patches/165_man_xorg_conf_no_device_ident.patch

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-04-11 09:51:56 UTC
  • mfrom: (1.1.41 upstream) (0.1.26 experimental)
  • Revision ID: james.westby@ubuntu.com-20110411095156-ymlp7gnfsoplroug
Tags: 2:1.10.0.902-1ubuntu1
* Merge from Debian experimental.
  - dropped patches, included upstream:
    213_xichangehierarchy-check-oom.patch
    216_fix_sdksyms_build.diff, included upstream.
    218_getValuatorEvents_cleanup.patch
    219_xi1_handle_noncontinuous_valuator_data.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/165_man_xorg_conf_no_device_ident.patch
9
9
 hw/xfree86/doc/man/xorg.conf.man.pre |    4 +---
10
10
 1 files changed, 1 insertions(+), 3 deletions(-)
11
11
 
12
 
--- a/hw/xfree86/doc/man/xorg.conf.man
13
 
+++ b/hw/xfree86/doc/man/xorg.conf.man
14
 
@@ -1760,9 +1760,7 @@ sections have the following format:
 
12
Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man
 
13
===================================================================
 
14
--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man   2011-04-09 10:36:57.000000000 +0300
 
15
+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man        2011-04-09 10:38:10.000000000 +0300
 
16
@@ -1816,9 +1816,7 @@
15
17
 .PP
16
18
 The
17
19
 .B Identifier