Holger's qtopia repo: Changes to 'master-4.3.3'

git at git.openmoko.org git at git.openmoko.org
Thu Sep 4 03:38:32 CEST 2008


New branch 'master-4.3.3' available with the following commits:
commit 4b6fc77c8190886559a2b36ac29f709f7ef9fa8c
Merge: 98f7ffce6f8a76f3507ebb2bba85e7b4d3f7aa20 7207f5d1f11f7f23f0ea674ebc37c456fd9df807
Author: Holger Freyther <zecke at selfish.org>
Date:   Sat Aug 30 00:46:27 2008 +0200

    Merge branch 'rsync-version'
    
      -  Mostly follow the existing files for devices/ficgta01. Do not further
         delay the resume as done in uppstream vendor_ficgta01, do not change
         the amp mode...
      -  Nice to see the mem leak fixes in addressbook.cpp
      -  Re-remove the QWaitDialog and make sure it is compiling
    
    Conflicts:
    
    	devices/ficgta01/README
    	devices/ficgta01/configure
    	devices/ficgta01/custom.cpp
    	devices/ficgta01/projects.pri
    	devices/ficgta01/server/ficgta01volumeservice.cpp
    	devices/ficgta01/server/ficgta01volumeservice.h
    	devices/ficgta01/server/fichardware.cpp
    	devices/ficgta01/server/fichardware.h
    	devices/ficgta01/server/neosuspend.cpp
    	devices/ficgta01/src/plugins/audiohardware/ficgta01/ficgta01audioplugin.cpp
    	devices/ficgta01/src/plugins/phonevendors/ficgta01/vendor_ficgta01.cpp
    	devices/ficgta01/src/plugins/phonevendors/ficgta01/vendor_ficgta01_p.h
    	devices/ficgta01/src/plugins/qtopiacore/kbddrivers/ficgta01/ficgta01kbdhandler.h
    	doc/html/fd-Messaging.html
    	src/applications/addressbook/addressbook.cpp
    	src/libraries/qtopia/qtopia.pro
    	src/libraries/qtopia/qwaitwidget.cpp
    	src/libraries/qtopia/qwaitwidget.h
    	src/libraries/qtopia/themedview.cpp
    	src/libraries/qtopiabase/qtopialog-config.h
    	src/libraries/qtopiamail/qmailstore_p.cpp
    	src/libraries/qtopiaphonemodem/qmodemcall.cpp
    	src/libraries/qtopiaphonemodem/qmodemsupplementaryservices.cpp
    	src/plugins/inputmethods/predictivekeyboard/pred.cpp
    	src/plugins/mediaengines/gstreamer/gstreamerplaybinsession.cpp
    	src/server/obexservicemanager.cpp
    	src/server/phone/callhistory/default/callhistory.cpp
    	src/server/phone/telephony/ringcontrol/ringcontrol.cpp
    	src/server/server.pro




More information about the commitlog mailing list