projects / platform / core / uifw / dali-adaptor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c0a37b 1b44e30)
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh 65/39565/1
authorFrancisco Santos <f1.santos@samsung.com>
Mon, 18 May 2015 16:45:52 +0000 (17:45 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Mon, 18 May 2015 16:45:52 +0000 (17:45 +0100)
Conflicts:
adaptors/common/indicator-impl.h

Change-Id: Iaff09e5fd5ad5634b722a4dc4ecd96c0fce5f958

1  2 
build/tizen/adaptor/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc build/tizen/adaptor/Makefile.am
Simple merge
Domain: Graphics System / DALi;