UIB : merge devlop branch 19/16519/1
authorYongHwan <yonghwan82.jeon@samsung.com>
Tue, 18 Feb 2014 05:59:41 +0000 (14:59 +0900)
committerYongHwan <yonghwan82.jeon@samsung.com>
Tue, 18 Feb 2014 05:59:41 +0000 (14:59 +0900)
commitbfa91b1735ae1f9dc1696e1eaf86dcecdd35b596
treedbb676407e51dd1b41b13bde2584ecd9ebca8825
parent1b12cec0d3f64bebb17fb7a28c3dd2d9f5c5b0a4
parentba4325daba98d5f6df763f88605e64f8516f2a52
UIB : merge devlop branch
Merge remote-tracking branch 'origin/develop' into tizen

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/wizards/project/ProjectTemplateContributor.java

Change-Id: I6ce59ba40282dd1e8afa1d8e57f24826fa89ac0d
Signed-off-by: YongHwan <yonghwan82.jeon@samsung.com>