projects / platform / framework / web / wrt-security.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1bf26d5 64f5ef0)
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/framework/web/wrt-securit... accepted/tizen/20130912.185101 accepted/tizen/20130912.193332 accepted/tizen/20130913.063722 submit/tizen/20130909.074700 submit/tizen/20130912.080544 submit/tizen/20130912.090841
authorHyunwoo Kim <hwlove.kim@samsung.com>
Mon, 9 Sep 2013 07:44:51 +0000 (16:44 +0900)
committerHyunwoo Kim <hwlove.kim@samsung.com>
Mon, 9 Sep 2013 07:45:35 +0000 (16:45 +0900)
commitd03b3481fbb9650ac775919a2354785b619bcc62
tree29d20a1e616709db278735422fba4846079b729ctree | snapshot
parent1bf26d5d8f148437905bcbb0c333feaafbc0dd55commit | diff
parent64f5ef073df8edc2d1e3b7d38b2fe2bfdec34de5commit | diff
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/framework/web/wrt-security into tizen

Conflicts:
packaging/wrt-security.changes
packaging/wrt-security.manifest
packaging/wrt-security.spec
src/services/ace/logic/simple_roaming_agent.cpp

Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>
ace/configuration/TizenPolicy.xml diff1 | diff2 | blob | history
packaging/wrt-security.changes diff1 | diff2 | blob | history
packaging/wrt-security.spec diff1 | diff2 | blob | history
Domain: Web Framework / Uncategorized;