[SCM] libva/master: Merge tag 'upstream/1.1.0'

[mfv-guest at users.alioth.debian.org]

Imported Upstream version 1.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d37b4ce489af0ef6440e7e76c3e258a693cea410
X-Git-Newrev: b0abb7aef3e096662f7f7aa8449c7412bab24ecc

The following commit has been merged in the master branch:
commit 79fd33a3a06ed5d505320e4191089f20622221f9
Merge: d37b4ce489af0ef6440e7e76c3e258a693cea410 e1030032b2daa4b08c3803f27e863802b9b2000e
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Jan 16 10:09:27 2013 +0100

    Merge tag 'upstream/1.1.0'
    
    Upstream version 1.1.0
    
    # gpg: Signature made Wed 16 Jan 2013 10:09:23 AM CET using RSA key ID 83B2CF7A
    # gpg: Good signature from "Matteo F. Vescovi <mfv.debian at gmail.com>"

diff --combined .gitignore
index dcc2c50,30af177..5c0ccf0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  *~
  *.o
  *.lo
@@@ -24,6 -23,12 +24,12 @@@ config.su
  configure
  debian.upstream/changelog
  debian.upstream/control
+ debian.upstream/libva-drm*.install
+ debian.upstream/libva-egl*.install
+ debian.upstream/libva-glx*.install
+ debian.upstream/libva-wayland*.install
+ debian.upstream/libva-x11*.install
+ debian.upstream/libva[0-9]*.install
  depcomp
  install-sh
  libtool

-- 
libva packaging