Commit Graph

10 Commits

Author SHA1 Message Date
jonnyboy d8d2c0fc39 proper merge 2013-01-21 07:07:59 +01:00
jonnyboy 63deced767 Merge branch 'dev'
Conflicts:
	README.md
	bin/cleanup_scripts.sh
	bin/innodb/backfill.php
	bin/innodb/backfill_threaded.php
	bin/innodb/lib/framework/db.php
	bin/innodb/lib/innodb/config.php
	bin/innodb/lib/innodb/convertToInnoDB.php
	bin/innodb/nzb-import.php
	bin/innodb/update_binaries.php
	bin/innodb/update_binaries_threaded.php
	bin/monitor.php
	bin/postProcessing1.sh
	bin/postProcessing2.sh
	bin/postProcessing3.sh
	bin/postProcessing4.sh
	bin/postProcessing5.sh
	bin/postProcessing6.sh
	bin/processAlternate2.php
	bin/processAlternate4.php
	bin/processBooks.php
	bin/processGames.php
	bin/processMovies.php
	bin/processMusic.php
	bin/processTv.php
	bin/workhorse.sh
	conf/tmux.conf
	edit_these.sh
	set_perms.sh
	start.sh
2013-01-21 07:00:08 +01:00
jonnyboy 93c6c2b6fc hopefully fixed and completely working 2013-01-21 04:32:50 +01:00
jonnyboy 37ead73ed6 major changes, monitor.php runs all scripts, easier on cpu 2013-01-15 02:12:47 +01:00
jonnyboy b648569fbc updated kevins scripts 2013-01-12 23:39:27 -05:00
jonnyboy b43d043cd9 changed delay 10 to 0 2013-01-09 22:05:36 -05:00
jonnyboy fa74481f76 put back files removed 2013-01-06 17:49:20 -05:00
jonnyboy 256f1089eb fixed mulptiple path problems
rearranged the panels
2013-01-06 16:26:12 -05:00
jonnyboy 56ba959624 fixed query 2013-01-05 10:11:00 -05:00
jonnyboy 596a74c22d thanks to kevin123 lots of changes 2013-01-05 06:18:54 -05:00