mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into assistant

Browse source 
Conflicts:
	Makefile
	debian/copyright
This commit is contained in:
Joey Hess 2012-08-20 16:04:56 -04:00
commit 68f1be8f0a
15 changed files with 481 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/copyright vendored
View file

@ -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