[PATCH v2 xserver 2/2] Xinput: use appropriate copyright markup for a multi licensed doc

[Keith Packard]

On Thu, 29 Sep 2011 07:53:16 -0400, Gaetan Nadon <memsize at videotron.ca> wrote:
> Removed a duplicate paragraph.

Both of these are merged.
   fad04dd..2f09f6e  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111003/d2a404d8/attachment.pgp>