gitphp 0.2.9.1 :: busui.git/commit

projects / busui.git / commit

Merge branch 'master' of ssh://apples.lambdacomplex.org/git/busui

author	maxious
	Wed, 16 Mar 2011 07:30:08 +0000 (18:30 +1100)
committer	maxious
	Wed, 16 Mar 2011 07:30:08 +0000 (18:30 +1100)
commit	3c7ee4b626b8e8c1e44ece95d045450a96021308
tree	708171095f3e6f967185f9b5337ce6e96816f86c	tree \| snapshot
parent	c6a81e7cb2be952cfca5805d5af6f8ce0bf70b6c	commit \| commitdiff
parent	3fdb315c6e4cef32e7793265d130085fdfa3923e	commit \| commitdiff

Merge branch 'master' of ssh://apples.lambdacomplex.org/git/busui

Conflicts:
trip.php

902 files changed:

common-template.inc.php		blob \| diff \| history \| plain
common.inc.php		blob \| diff \| history \| plain
css/images/113-navigation.png		blob \| diff \| history \| plain
css/jquery.ui.datepicker.mobile.css		blob \| diff \| history \| plain
js/jQuery.ui.datepicker.js		blob \| diff \| history \| plain
js/jquery.ui.datepicker.mobile.js	[ deleted file ]	blob \| history \| plain
mywaybalance.php		blob \| diff \| history \| plain
owa/Callbacks.inc	[ deleted file ]	blob \| history \| plain
owa/action.php	[ deleted file ]	blob \| history \| plain
owa/api.php	[ deleted file ]	blob \| history \| plain
owa/cli.php	[ deleted file ]	blob \| history \| plain
owa/conf/countryCodes2Names.php	[ deleted file ]	blob \| history \| plain
owa/conf/countryNames2Codes.php	[ deleted file ]	blob \| history \| plain
owa/conf/index.php	[ deleted file ]	blob \| history \| plain
owa/conf/messages.php	[ deleted file ]	blob \| history \| plain
owa/conf/os.ini	[ deleted file ]	blob \| history \| plain
owa/conf/query_strings.ini	[ deleted file ]	blob \| history \| plain
owa/conf/robots.ini	[ deleted file ]	blob \| history \| plain
owa/conf/search_engines.ini	[ deleted file ]	blob \| history \| plain
owa/daemon.php	[ deleted file ]	blob \| history \| plain
owa/eventQueue.php	[ deleted file ]	blob \| history \| plain
owa/includes/CronParser.php	[ deleted file ]	blob \| history \| plain
owa/includes/Daemon.class.php	[ deleted file ]	blob \| history \| plain
owa/includes/JSON.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/composite.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/console.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/daemon.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/display.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/error_log.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/file.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/firebug.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/mail.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/mcal.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/mdb2.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/null.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/observer.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/sql.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/sqlite.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/syslog.php	[ deleted file ]	blob \| history \| plain
owa/includes/Log-1.12.2/Log/win.php	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/ChangeLog.txt	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/LICENSE	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/README	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/class.phpmailer.php	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/class.pop3.php	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/class.smtp.php	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/codeworxtech.html	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/docs/extending.html	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/docs/faq.html	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/docs/phpmailer_sm.gif	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/docs/pop3_article.txt	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/docs/use_gmail.txt	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/examples/contents.html	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/examples/images/bkgrnd.gif	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/examples/images/phpmailer.gif	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.3/examples/images/phpmailer.png	[ deleted file ]	blob \| history \| plain
owa/includes/PHPMailer_v2.0.