review.tizen.org Git - platform/core/api/webapi-plugins.git/commit

projects / platform / core / api / webapi-plugins.git / commit

author	pius.lee <pius.lee@samsung.com>
	Wed, 10 Jun 2015 12:36:49 +0000 (21:36 +0900)
committer	pius.lee <pius.lee@samsung.com>
	Wed, 10 Jun 2015 14:10:24 +0000 (23:10 +0900)
commit	61ce097a5676d9d761702f8987dc777cb342ebaf
tree	a5aca1a0808620cba75645b2e0d089b4f8e82441	tree \| snapshot
parent	fadc05a90b2bd36df1b3cfe7714a18cdda5f7ca4	commit \| diff
parent	268bf35957ae0e529c9dddcdaa59804a679aa298	commit \| diff

Merge branch 'tizen_2.4' into HEAD

Conflicts:
packaging/webapi-plugins.spec
src/archive/filesystem_node.cc
src/bookmark/bookmark_instance.cc
src/common/extension.cc
src/contact/contact_util.cc
src/exif/exif_tag_saver.cc
src/filesystem/filesystem_manager.cc
src/filesystem/filesystem_stat.cc
src/messaging/message.cc
src/messaging/messaging_util.cc
src/nfc/nfc_adapter.cc
src/nfc/nfc_instance.cc
src/notification/notification_manager.cc
src/systeminfo/systeminfo-utils.cpp
src/systemsetting/systemsetting_instance.cc

Change-Id: Ia15074aed590534d371f955c11a502216c9d08a7

Domain: Web Framework / Web API;

RSS Atom

packaging/webapi-plugins.spec	diff1 \|	diff2 \|	blob \| history
src/application/application_manager.cc	diff1 \|	diff2 \|	blob \| history
src/archive/archive_manager.h	diff1 \|	diff2 \|	blob \| history
src/bluetooth/bluetooth_gatt_service.cc	diff1 \|	diff2 \|	blob \| history
src/datacontrol/datacontrol_instance.cc	diff1 \|	diff2 \|	blob \| history
src/download/download_instance.cc	diff1 \|	diff2 \|	blob \| history
src/nfc/nfc_adapter.cc	diff1 \|	diff2 \|	blob \| history
src/systeminfo/systeminfo-utils.cpp	diff1 \|	diff2 \|	blob \| history
src/systeminfo/systeminfo-utils.h	diff1 \|	diff2 \|	blob \| history
src/systeminfo/systeminfo.gyp	diff1 \|	diff2 \|	blob \| history
src/systemsetting/systemsetting_instance.cc	diff1 \|	diff2 \|	blob \| history