projects / platform / framework / web / heap-monitor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 64ce0de 47bd86c)
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/heap-monitor... accepted/tizen/ivi/stable accepted/tizen_common accepted/tizen_generic accepted/tizen_ivi accepted/tizen_mobile accepted/tizen/20131022.083550 accepted/tizen/20131022.163153 accepted/tizen/20131112.015413 accepted/tizen/ivi/20140308.005229 accepted/tizen/mobile/20140310.024826 accepted/tizen_ivi_stable/20131116.111517 submit/tizen/20131022.035955 submit/tizen/20140307.080709 submit/tizen_ivi_stable/20131116.101026
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:46:29 +0000 (12:46 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:46:29 +0000 (12:46 +0900)
commitd41e35de4036c319289f2dc34262ab7f37ccfbfd
treef625ec77f3d42c82704e32056364b14f26cddd62tree | snapshot
parent64ce0de529c87a9e83bfefc586e877ee43a7442fcommit | diff
parent47bd86cb961a3f2fff4c36dd7771cdaa2f9cc469commit | diff
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/heap-monitor into work

Conflicts:
CMakeLists.txt
packaging/libheap-monitor.spec

Change-Id: Idca5571207e866602a63cfa49e3c870120473287
CMakeLists.txt diff1 | diff2 | blob | history
packaging/libheap-monitor.spec diff1 | diff2 | blob | history
Domain: Web Framework / Uncategorized;