review.tizen.org Git - platform/upstream/file.git/commit

projects / platform / upstream / file.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 10ce0fd 3956ea6)

author	DongHun Kwak <dh0128.kwak@samsung.com>
	Wed, 21 Jun 2017 05:24:41 +0000 (14:24 +0900)
committer	DongHun Kwak <dh0128.kwak@samsung.com>
	Wed, 21 Jun 2017 05:24:41 +0000 (14:24 +0900)
commit	6897f63f18a1aee1c1a4138a9765035db4fc5d3f
tree	6554f3850c2ad87548e5481dfd3a8315e36e095d	tree \| snapshot
parent	10ce0fda618c13c0e8201e406836aba52207383e	commit \| diff
parent	3956ea65fa71d4823d870ffac1c7efc56e8f0253	commit \| diff

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

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

python/magic.py	diff1 \|	diff2 \|	blob \| history
src/compress.c	diff1 \|	diff2 \|	blob \| history
src/readcdf.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Base;