Merge commit 'origin/master' into dbus

Conflicts: .gitignore src/Makefile.am src/managerimpl.cpp

Merge commit 'origin/master' into dbus
Conflicts: .gitignore src/Makefile.am src/managerimpl.cpp
fb081475 · Pierre-Luc Beaudoin · 96868436 · 4be69b42 · fb081475 · fb081475
Commit fb081475 authored Sep 07, 2007 by Pierre-Luc Beaudoin
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -19,7 +19,7 @@
 */

 #include "eventthread.h"
-#include "voIPLink.h"
+#include "voiplink.h"

 EventThread::EventThread (VoIPLink* link) : Thread () 
 {

--- a/src/iaxaccount.cpp
+++ b/src/iaxaccount.cpp
--- a/src/iaxcall.cpp
+++ b/src/iaxcall.cpp
--- a/src/iaxcall.h
+++ b/src/iaxcall.h
--- a/src/iaxvoiplink.cpp
+++ b/src/iaxvoiplink.cpp
--- a/src/iaxvoiplink.h
+++ b/src/iaxvoiplink.h
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
--- a/src/sipaccount.cpp
+++ b/src/sipaccount.cpp
--- a/src/sipcall.cpp
+++ b/src/sipcall.cpp
--- a/src/sipcall.h
+++ b/src/sipcall.h
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
--- a/src/sipvoiplink.h
+++ b/src/sipvoiplink.h
--- a/src/user_cfg.h
+++ b/src/user_cfg.h
--- a/src/voIPLink.cpp
+++ b/src/voIPLink.cpp
--- a/src/voIPLink.h
+++ b/src/voIPLink.h
--- a/www/config.inc.php
+++ b/www/config.inc.php
--- a/www/footer.php
+++ b/www/footer.php
--- a/www/header.php
+++ b/www/header.php
--- a/www/images/bg-grad.png
+++ b/www/images/bg-grad.png
--- a/www/images/devel.png
+++ b/www/images/devel.png