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 /.gitignore | |
| parent | dcd208513d24c609719065c51eb176f6b0df3024 (diff) | |
| parent | 08db0b9fa3cbf49d465479fabfab0c8f1b521b1c (diff) | |
Merge branch 'master' into assistant
Conflicts:
Makefile
debian/copyright
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4a18e7f26..290ad66de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ tmp test configure +build-stamp Build/SysConfig.hs git-annex git-annex.1 |