[SCM] swh-lv2/master: Merge commit 'upstream/1.0.15+20110312.git9c9935e'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.0.15+20110312.git9c9935e
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8272e020a46220d88412ed814d442cc7157c138c
X-Git-Newrev: f4e885d681c5d5d55a3009e2bf8b16aea8f5881d

The following commit has been merged in the master branch:
commit f4e885d681c5d5d55a3009e2bf8b16aea8f5881d
Merge: 8272e020a46220d88412ed814d442cc7157c138c c2fc99bc529b25c20306ab2dbdfa5c5c76f5a8d3
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 17 11:19:47 2011 +0200

    Merge commit 'upstream/1.0.15+20110312.git9c9935e'
    
    Solved conflicts:
    	.gitignore

diff --combined .gitignore
index 07c7d06,0000000..b408e6c
mode 100644,000000..100644
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,0 +1,1 @@@
- *.o
- *.so
- plugins/*-swh.lv2/manifest.ttl
- plugins/*-swh.lv2/manifest.ttl.in
- plugins/*-swh.lv2/plugin.c
- plugins/*-swh.lv2/plugin.ttl
- .pc
++/.pc

-- 
swh-lv2 packaging