projects / platform / framework / native / shell.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a56b22 3db2b65)
Merge branch 'master' into tizen_2.1
authorjungmin76.park <jungmin76.park@samsung.com>
Thu, 21 Mar 2013 14:35:03 +0000 (23:35 +0900)
committerjungmin76.park <jungmin76.park@samsung.com>
Thu, 21 Mar 2013 14:35:03 +0000 (23:35 +0900)
Conflicts:
inc/FShellAppWidgetProviderManager.h
inc/FShellLockManager.h
inc/FShellNotificationManager.h
inc/FShellQuickPanelFrame.h
inc/FShellShortcutManager.h
src/FShell_AppWidgetPopupView.cpp
src/FShell_AppWidgetPopupView.h
src/FShell_AppWidgetProviderManagerImpl.cpp
src/FShell_AppWidgetView.cpp
src/FShell_AppWidgetView.h
src/core/FShellShortcutManager.cpp

Change-Id: Ieadba936ebda9534a412b69e6cfa1f5227afd3fb
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

Trivial merge
Domain: System / Uncategorized;