merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:06 +0000 (01:19 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:06 +0000 (01:19 +0900)
commit46e7886bea8e2c89c57b8e443dcfc1e66e17453b
tree0471db672c8f2bcf714979c1fbd84ddbd90b80b6
parent5e4e17ecfcf11a6433ba55d88fd9ad1961f44833
merge with master
19 files changed:
arm/opt/home/app/.e/e/config/samsung/Makefile.am
arm/opt/home/app/.e/e/config/samsung/e.src
arm/opt/home/app/.e/e/config/samsung/module.comp-tizen.src [moved from arm/opt/home/app/.e/e/config/samsung/module.comp-slp.src with 98% similarity]
arm/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src [moved from i386/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src with 100% similarity]
arm/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src [moved from i386/opt/home/app/.e/e/config/samsung/module.illume2-slp.src with 100% similarity]
arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src [moved from i386/opt/home/app/.e/e/config/samsung/module.move-slp.src with 100% similarity]
emulator/opt/home/app/.e/e/config/samsung/Makefile.am
emulator/opt/home/app/.e/e/config/samsung/e.src
emulator/opt/home/app/.e/e/config/samsung/module.comp-tizen.src [moved from emulator/opt/home/app/.e/e/config/samsung/module.comp-slp.src with 98% similarity]
emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src [moved from emulator/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src with 100% similarity]
emulator/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src [moved from emulator/opt/home/app/.e/e/config/samsung/module.illume2-slp.src with 100% similarity]
emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src [moved from emulator/opt/home/app/.e/e/config/samsung/module.move-slp.src with 100% similarity]
i386/opt/home/app/.e/e/config/samsung/Makefile.am
i386/opt/home/app/.e/e/config/samsung/e.src
i386/opt/home/app/.e/e/config/samsung/module.comp-tizen.src [moved from i386/opt/home/app/.e/e/config/samsung/module.comp-slp.src with 98% similarity]
i386/opt/home/app/.e/e/config/samsung/module.devicemgr-tizen.src [moved from arm/opt/home/app/.e/e/config/samsung/module.devicemgr-slp.src with 100% similarity]
i386/opt/home/app/.e/e/config/samsung/module.illume2-tizen.src [moved from arm/opt/home/app/.e/e/config/samsung/module.illume2-slp.src with 100% similarity]
i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src [moved from arm/opt/home/app/.e/e/config/samsung/module.move-slp.src with 100% similarity]
packaging/e17-misc.spec