Timestamp:
Oct 4, 2013 8:18:32 AM (11 years ago)
Author:
Mei <mei@…>
Branches:
master
Children:
75fc453
Parents:
5783a6f (diff), 2e92c62 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'abac0-leak' of ​git://abac.deterlab.net/abac

Conflicts:

libabac/abac_id.c

(No files)

Note: See TracChangeset for help on using the changeset viewer.