review.tizen.org Git - platform/upstream/procps-ng.git/commit

projects / platform / upstream / procps-ng.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 60ae089 d2cf125)

author	DongHun Kwak <dh0128.kwak@samsung.com>
	Wed, 22 Nov 2017 05:50:30 +0000 (14:50 +0900)
committer	DongHun Kwak <dh0128.kwak@samsung.com>
	Wed, 22 Nov 2017 05:50:30 +0000 (14:50 +0900)
commit	4a8ae8639261a3c91d9936ff4d0009a338b89ffe
tree	d2a1fc5a8d30e7d66bbb6c389b777b089ca505d4	tree \| snapshot
parent	60ae0892aec1a252a521b9639f93b571295ca293	commit \| diff
parent	d2cf125ecf05a531f26a992c8ec02118b1739aff	commit \| diff

Merge branch 'tizen_base' of ssh://review.tizen.org:29418/platform/upstream/procps-ng into tizen_base

Change-Id: I67f0f252563bc84b9c01d8d7b2f65064c6d6f802
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

proc/sysinfo.c	diff1 \|	diff2 \|	blob \| history
ps/common.h	diff1 \|	diff2 \|	blob \| history
ps/parser.c	diff1 \|	diff2 \|	blob \| history
ps/select.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;