2 commits

Author	SHA1	Message	Date
Christian Boltz	31a57bdfa9	update the aa-mergeprof manpage to match the new commandline syntax ... introduced with the aa-mergeprof patch collection. Acked-by: Steve Beattie <steve@nxnw.org>	2014-10-16 20:26:45 +02:00
Steve Beattie	f989dd0132	Merge in Kshitij Gupta <kgupta8592@gmail.com>'s rewrite of the ... logprof/genprof and related utilities in python. Because the branch that was worked on was not based on the apparmor tree, not all of the history can be maintained for files that are not newly created or entirely rewritten in the branch. (This merge also includes a subsequent commit to the branch I was merging from which includes my missed bzr add of utils/apparmor/translations.py)	2014-02-12 15:54:00 -08:00