Merge pull request #5774 from keszybz/printf-annotations

author Djalal Harouni <tixxdz@opendz.org>

Sat, 22 Apr 2017 23:03:42 +0000 (01:03 +0200)

committer GitHub <noreply@github.com>

Sat, 22 Apr 2017 23:03:42 +0000 (01:03 +0200)
author Djalal Harouni <tixxdz@opendz.org>
Sat, 22 Apr 2017 23:03:42 +0000 (01:03 +0200)
committer GitHub <noreply@github.com>
Sat, 22 Apr 2017 23:03:42 +0000 (01:03 +0200)
diff --cc src/core/execute.c
Simple merge
diff --cc src/coredump/coredump.c
Simple merge
author	Djalal Harouni <tixxdz@opendz.org>
	Sat, 22 Apr 2017 23:03:42 +0000 (01:03 +0200)
committer	GitHub <noreply@github.com>
	Sat, 22 Apr 2017 23:03:42 +0000 (01:03 +0200)
		1	2
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/coredump/coredump.c	patch \|	diff1 \|	diff2 \|	blob \| history