review.tizen.org Git - platform/framework/web/wrt-commons.git/commit

projects / platform / framework / web / wrt-commons.git / commit

author	Soo-Hyun Choi <sh9.choi@samsung.com>
	Tue, 1 Oct 2013 01:16:15 +0000 (10:16 +0900)
committer	Soo-Hyun Choi <sh9.choi@samsung.com>
	Tue, 1 Oct 2013 01:16:15 +0000 (10:16 +0900)
commit	bb3051d4e393aa7e071e66ddd2551b8cb0d445c0
tree	d6273aced751c17b490e759d2fa555ee112cda45	tree \| snapshot
parent	fc9500cc915282026b320acfa4842f1513ae56bc	commit \| diff
parent	8914a24625e6d766c82a885d4703713bb208817f	commit \| diff

Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen

[Note] Backporting Tizen RSA wrt-commons

Conflicts:
build/encryption/CMakeLists.txt
build/i18n/wrt-commons-i18n-dao-ro.pc.in
packaging/wrt-commons.spec
wrt-commons.manifest

Change-Id: Idc88e4636917b534d004b398f2489e516f9d66e8

Domain: Web Framework / Uncategorized;

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
build/test/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
build/test/dpl-test-efl.pc.in	diff1 \|	diff2 \|	blob \| history
etc/wrt_commons_create_clean_db.sh	diff1 \|	diff2 \|	blob \| history
modules/db/include/dpl/db/thread_database_support.h	diff1 \|	diff2 \|	blob \| history
modules/security_origin_dao/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/widget_dao/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/widget_dao/dao/widget_dao_read_only.cpp	diff1 \|	diff2 \|	blob \| history
modules/widget_dao/include/dpl/wrt-dao-ro/global_config.h	diff1 \|	diff2 \|	blob \| history
packaging/wrt-commons.spec	diff1 \|	diff2 \|	blob \| history