projects
/
platform
/
upstream
/
libxml2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e52e7cd
631eb64
)
Merge branch 'tizen' into tizen_base
18/63818/1
submit/tizen_base/20160411.015551
author
DongHun Kwak
<dh0128.kwak@samsung.com>
Mon, 28 Mar 2016 03:02:58 +0000
(12:02 +0900)
committer
DongHun Kwak
<dh0128.kwak@samsung.com>
Mon, 28 Mar 2016 03:02:58 +0000
(12:02 +0900)
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Conflicts:
SAX2.c
packaging/libxml2.manifest
packaging/libxml2.spec
packaging/python-libxml2.spec
Change-Id: I90f1ac4e938f1107dac1e851821de691531a8836
Trivial merge