Merge branch 'master' into tizen_2.2
authorYoumin Ha <youmin.ha@samsung.com>
Mon, 24 Jun 2013 10:13:31 +0000 (19:13 +0900)
committerYoumin Ha <youmin.ha@samsung.com>
Mon, 24 Jun 2013 10:15:23 +0000 (19:15 +0900)
commitdd439221967503196bb4a69e9b8352300635dc62
treee514de7777a1ff4062fa03f9fed694691d53b103
parentaf32ba85d090cff6f14b23ffcdddf43432de1c8b
parent27b2007bdf873f94b681331b01b82505a15c65cf
Merge branch 'master' into tizen_2.2

Conflicts:
main.js
widgets/list/list-vi.html
widgets/naviframe/naviframe_footer_more_button.html

Change-Id: Idbe0f43d3abeeca51eb3dd2980790b2f4d0589dd
index.html
packaging/TizenWinset.changes
packaging/TizenWinset.spec
tips/generate-elements-dynamically/generate-elements-dynamically.html
widgets/naviframe/naviframe_footer_more_button.html