diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-20 16:04:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-20 16:04:56 -0400 |
| commit | 68f1be8f0a79bcff595c7aff2289bb95c4d5b590 (patch) | |
| tree | 00d36cf1be1cc795ca46e81950c7fa293f5a5d26 /debian/copyright | |
| parent | dcd208513d24c609719065c51eb176f6b0df3024 (diff) | |
| parent | 08db0b9fa3cbf49d465479fabfab0c8f1b521b1c (diff) | |
Merge branch 'master' into assistant
Conflicts:
Makefile
debian/copyright
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright index 4e7345fd8..3ddba59f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -24,7 +24,7 @@ License: BSD-3-clause Utility/libmounts.c in this package's source, or in /usr/share/common-licenses/BSD on Debian systems. -Files: doc/logo.png doc/logo_small.png */favicon.ico +Files: doc/logo* */favicon.ico Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/> 2010 Joey Hess <joey@kitenet.net> License: other |