diff options
author | Joey Hess <joey@kitenet.net> | 2013-09-12 17:45:54 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-09-12 17:45:54 -0400 |
commit | 59ae2afd93a5f97ea243764da5b1cfa8c532b6d6 (patch) | |
tree | a87194e9d329593a592542d01ebc228974a02ba0 /doc/todo/makefile:_respect___36__PREFIX.mdwn | |
parent | 3a86e5dc358f811cc3887173cdaea79938fa9671 (diff) | |
parent | 83393df4e25106282e6df4ff3d202fc54dc63b69 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
doc/install/cabal.mdwn
Diffstat (limited to 'doc/todo/makefile:_respect___36__PREFIX.mdwn')
-rw-r--r-- | doc/todo/makefile:_respect___36__PREFIX.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/todo/makefile:_respect___36__PREFIX.mdwn b/doc/todo/makefile:_respect___36__PREFIX.mdwn index 8bfd71168..12d7274b9 100644 --- a/doc/todo/makefile:_respect___36__PREFIX.mdwn +++ b/doc/todo/makefile:_respect___36__PREFIX.mdwn @@ -21,3 +21,5 @@ index b8995b2..5b1a6d4 100644 --[[anarcat]] > [[done]] --[[Joey]] + +> > [[thanks]]! ;) --[[anarcat]] |