Merged barry-b1-socket-arch-branch into MAIN.
commit2631a9272d03598f0e6a9cba0c44db6f8b35934d
authorChris Frey <cdfrey@foursquare.net>
Fri, 25 Apr 2008 21:14:13 +0000 (25 17:14 -0400)
committerChris Frey <cdfrey@foursquare.net>
Fri, 25 Apr 2008 21:14:13 +0000 (25 17:14 -0400)
treed1245b6113912ec39568cb29f71d7c789cfc53c5
parentdaf278743d3a39aba800858258c979cfbe56827d
Merged barry-b1-socket-arch-branch into MAIN.

The socket-arch branch is now finished, continue development on MAIN (master).
53 files changed:
ChangeLog
doc/Exceptions
examples/Makefile.am
examples/addcalendar.cc
examples/addcontact.cc
gui/src/DeviceIface.cc
gui/src/DeviceIface.h
opensync-plugin/src/barry_sync.cc
opensync-plugin/src/environment.cc
opensync-plugin/src/environment.h
opensync-plugin/src/vcard.cc
opensync-plugin/src/vevent.cc
ppp/rogers.peer [new file with mode: 0644]
src/Makefile.am
src/barry.h
src/common.cc
src/common.h
src/controller.cc
src/controller.h
src/controllertmpl.h [copied from src/error.cc with 62% similarity]
src/dataqueue.cc [new file with mode: 0644]
src/dataqueue.h [new file with mode: 0644]
src/debug.h
src/error.cc
src/error.h
src/log.cc [copied from src/error.cc with 55% similarity]
src/log.h [new file with mode: 0644]
src/m_desktop.cc [copied from src/controller.cc with 54% similarity]
src/m_desktop.h [copied from src/controller.h with 56% similarity]
src/m_desktoptmpl.h [moved from src/controllertmpl.h with 79% similarity]
src/m_ipmodem.cc [new file with mode: 0644]
src/m_ipmodem.h [new file with mode: 0644]
src/m_serial.cc [new file with mode: 0644]
src/m_serial.h [new file with mode: 0644]
src/packet.cc
src/packet.h
src/probe.cc
src/probe.h
src/protostructs.h
src/record-internal.h
src/router.cc [new file with mode: 0644]
src/router.h [new file with mode: 0644]
src/scoped_lock.h [copied from src/common.h with 54% similarity]
src/socket.cc
src/socket.h
src/time.h
src/usbwrap.cc
src/usbwrap.h
tools/Makefile.am
tools/btool.cc
tools/btranslate.cc
tools/pppob.cc
tools/upldif.cc