@matheusbsbs / matheus-bagliano / commits / 76db9dec81
Fork 0

Merge branch 'master' into sp/gfi

git-fast-import requires use of inttypes.h, but the master branch has added it to git-compat-util differently than git-fast-import originally had used it. This merge back of master to the fast-import topic is to get (and use) inttypes.h the way master is using it. This is a partially evil merge to remove the call to setup_ident(), as the master branch now contains a change which makes this implicit and therefore removed the function declaration. (commit 01754769). Conflicts: git-compat-util.h

Shawn O. Pearce committed Jan 30, 2007 at 11:07 UTC 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a

No changes.