diff options
| author |  Joey Hess <id@joeyh.name> | 2013-05-13 20:11:30 -0500 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2013-05-13 20:11:30 -0500 |
| commit | 174da3515594fea9ebc1b346d8a52bfd16a443bf (patch) | |
| tree | 8bcd7d29a90fa2925a4916ef6f1ab0ef8e6e193a /Annex | |
| parent | 13c19fb0a0d1df6bfdd9ba2bca3eb45d624015d5 (diff) | |
| parent | 1dd4574909b40ffdb77ae1338b353156d73983af (diff) | |
Merge branch 'windows' of git://git-annex.branchable.com into windows
Diffstat (limited to 'Annex')
| -rw-r--r--[-rwxr-xr-x] | Annex/CatFile.hs | 0 | ||||
| -rwxr-xr-x | Annex/Content/Direct.hs | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | Annex/Journal.hs | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | Annex/Link.hs | 0 |
4 files changed, 1 insertions, 1 deletions
diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs index c7c01b40c..c7c01b40c 100755..100644 --- a/Annex/CatFile.hs +++ b/Annex/CatFile.hs diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs index 025ff60bf..b885b5e5b 100755 --- a/Annex/Content/Direct.hs +++ b/Annex/Content/Direct.hs @@ -29,7 +29,7 @@ import Common.Annex import qualified Annex import Annex.Perms import qualified Git -import Utility.TempFile +import Utility.Tmp import Logs.Location import Utility.InodeCache diff --git a/Annex/Journal.hs b/Annex/Journal.hs index e68591ce2..e68591ce2 100755..100644 --- a/Annex/Journal.hs +++ b/Annex/Journal.hs diff --git a/Annex/Link.hs b/Annex/Link.hs index 24ec6c7c9..24ec6c7c9 100755..100644 --- a/Annex/Link.hs +++ b/Annex/Link.hs |