Merge branch 'master' into assistant
Conflicts: Makefile debian/copyright
This commit is contained in:
commit
68f1be8f0a
15 changed files with 481 additions and 22 deletions
2
debian/copyright
vendored
2
debian/copyright
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue