merge from kamoso master master
authorreza shah <rshah0385@kireihana.com>
Mon, 19 Oct 2009 07:30:34 +0000 (16:30 +0900)
committerreza shah <rshah0385@kireihana.com>
Mon, 19 Oct 2009 07:30:34 +0000 (16:30 +0900)
commitfbf57f1c70111c3afd45da0b2049fbd45db50225
tree00b24683f061babb66d460ee0218cb4cb9ddf20d
parent75eb42a875a2920e6ad7f46fd31e37357fe27453
merge from kamoso master
112 files changed:
AUTHORS [changed mode: 0644->0755]
CMakeLists.txt [changed mode: 0644->0755]
COPYING [changed mode: 0644->0755]
Messages.sh [changed mode: 0644->0755]
TODO [changed mode: 0644->0755]
cmake/COPYING-CMAKE-SCRIPTS [changed mode: 0644->0755]
cmake/FindLibV4L2.cmake [changed mode: 0644->0755]
cmake/FindVLC.cmake [changed mode: 0644->0755]
icons/CMakeLists.txt [changed mode: 0644->0755]
icons/hi16-app-kamoso.png [changed mode: 0644->0755]
icons/hi22-app-kamoso.png [changed mode: 0644->0755]
icons/hi32-app-kamoso.png [changed mode: 0644->0755]
icons/hi48-app-kamoso.png [changed mode: 0644->0755]
icons/hi64-app-kamoso.png [changed mode: 0644->0755]
icons/hisc-app-kamoso.svgz [changed mode: 0644->0755]
kamoso.kdev4 [changed mode: 0644->0755]
po/addlang.sh [changed mode: 0644->0755]
po/ca/CMakeLists.txt [changed mode: 0644->0755]
po/ca/kamoso.po [changed mode: 0644->0755]
po/de/CMakeLists.txt [changed mode: 0644->0755]
po/de/kamoso.po [changed mode: 0644->0755]
po/es/CMakeLists.txt [changed mode: 0644->0755]
po/es/kamoso.po [changed mode: 0644->0755]
po/gl.po [changed mode: 0644->0755]
po/kamoso.pot [changed mode: 0644->0755]
ports/archlinux/PKGBUILD [changed mode: 0644->0755]
src/.kdev_include_paths [changed mode: 0644->0755]
src/CMakeLists.txt [changed mode: 0644->0755]
src/burstshootmode.cpp [changed mode: 0644->0755]
src/burstshootmode.h [changed mode: 0644->0755]
src/config-nepomuk.h.cmake [changed mode: 0644->0755]
src/countdownwidget.cpp [changed mode: 0644->0755]
src/countdownwidget.h [changed mode: 0644->0755]
src/customDelegate.cpp [changed mode: 0644->0755]
src/customDelegate.h [changed mode: 0644->0755]
src/device.cpp [changed mode: 0644->0755]
src/device.h [changed mode: 0644->0755]
src/devicemanager.cpp [changed mode: 0644->0755]
src/devicemanager.h [changed mode: 0644->0755]
src/generalConfig.ui [changed mode: 0644->0755]
src/kamoso.cpp [changed mode: 0644->0755]
src/kamoso.desktop [changed mode: 0644->0755]
src/kamoso.h [changed mode: 0644->0755]
src/kamosojob.cpp [changed mode: 0644->0755]
src/kamosojob.h [changed mode: 0644->0755]
src/kamosojobtracker.cpp [changed mode: 0644->0755]
src/kamosojobtracker.h [changed mode: 0644->0755]
src/kamosoplugin.cpp [changed mode: 0644->0755]
src/kamosoplugin.desktop [changed mode: 0644->0755]
src/kamosoplugin.h [changed mode: 0644->0755]
src/mainWidget.ui [changed mode: 0644->0755]
src/photoshootmode.cpp [changed mode: 0644->0755]
src/photoshootmode.h [changed mode: 0644->0755]
src/pictureConfig.ui [changed mode: 0644->0755]
src/pluginmanager.cpp [changed mode: 0644->0755]
src/pluginmanager.h [changed mode: 0644->0755]
src/plugins/CMakeLists.txt [changed mode: 0644->0755]
src/plugins/execute/CMakeLists.txt [changed mode: 0644->0755]
src/plugins/execute/execute.cpp [changed mode: 0644->0755]
src/plugins/execute/execute.desktop [changed mode: 0644->0755]
src/plugins/execute/execute.h [changed mode: 0644->0755]
src/plugins/facebook/CMakeLists.txt [changed mode: 0644->0755]
src/plugins/facebook/facebook.cpp [changed mode: 0644->0755]
src/plugins/facebook/facebook.h [changed mode: 0644->0755]
src/plugins/facebook/facebooksender.desktop [changed mode: 0644->0755]
src/plugins/facebook/facebooktest.cpp [changed mode: 0644->0755]
src/plugins/facebook/facebooktest.h [changed mode: 0644->0755]
src/plugins/facebook/fbalbum.cpp [changed mode: 0644->0755]
src/plugins/facebook/fbalbum.h [changed mode: 0644->0755]
src/plugins/facebook/fbitem.h [changed mode: 0644->0755]
src/plugins/facebook/fbtalker.cpp [changed mode: 0644->0755]
src/plugins/facebook/fbtalker.h [changed mode: 0644->0755]
src/plugins/facebook/icons/CMakeLists.txt [changed mode: 0644->0755]
src/plugins/facebook/icons/hi16-action-facebook.png [changed mode: 0644->0755]
src/plugins/facebook/icons/hi22-action-facebook.png [changed mode: 0644->0755]
src/plugins/facebook/icons/hi32-action-facebook.png [changed mode: 0644->0755]
src/plugins/facebook/icons/hi48-action-facebook.png [changed mode: 0644->0755]
src/plugins/facebook/icons/hisc-action-facebook.svgz [changed mode: 0644->0755]
src/plugins/facebook/mpform.cpp [changed mode: 0644->0755]
src/plugins/facebook/mpform.h [changed mode: 0644->0755]
src/plugins/trash/CMakeLists.txt [changed mode: 0644->0755]
src/plugins/trash/trash.cpp [changed mode: 0644->0755]
src/plugins/trash/trash.desktop [changed mode: 0644->0755]
src/plugins/trash/trash.h [changed mode: 0644->0755]
src/plugins/youtube/CMakeLists.txt [changed mode: 0644->0755]
src/plugins/youtube/icons/CMakeLists.txt [changed mode: 0644->0755]
src/plugins/youtube/icons/hi16-action-youtube.png [changed mode: 0644->0755]
src/plugins/youtube/icons/hi22-action-youtube.png [changed mode: 0644->0755]
src/plugins/youtube/icons/hi32-action-youtube.png [changed mode: 0644->0755]
src/plugins/youtube/icons/hi48-action-youtube.png [changed mode: 0644->0755]
src/plugins/youtube/icons/hi64-action-youtube.png [changed mode: 0644->0755]
src/plugins/youtube/icons/hisc-action-youtube.svgz [changed mode: 0644->0755]
src/plugins/youtube/videoInfo.ui [changed mode: 0644->0755]
src/plugins/youtube/youtube.cpp [changed mode: 0644->0755]
src/plugins/youtube/youtube.desktop [changed mode: 0644->0755]
src/plugins/youtube/youtube.h [changed mode: 0644->0755]
src/plugins/youtube/youtubejob.cpp [changed mode: 0644->0755]
src/plugins/youtube/youtubejob.h [changed mode: 0644->0755]
src/settings.kcfgc [changed mode: 0644->0755]
src/shootmode.cpp [changed mode: 0644->0755]
src/shootmode.h [changed mode: 0644->0755]
src/thumbnailview.cpp [changed mode: 0644->0755]
src/thumbnailview.h [changed mode: 0644->0755]
src/timedpushbutton.cpp [changed mode: 0644->0755]
src/timedpushbutton.h [changed mode: 0644->0755]
src/videoshootmode.cpp [changed mode: 0644->0755]
src/videoshootmode.h [changed mode: 0644->0755]
src/webcamwidget.h [changed mode: 0644->0755]
src/whitewidget.cpp [changed mode: 0644->0755]
src/whitewidget.h [changed mode: 0644->0755]
src/whitewidgetmanager.cpp [changed mode: 0644->0755]
src/whitewidgetmanager.h [changed mode: 0644->0755]