Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
This commit is contained in:
mattbk
2015-11-07 12:36:53 -06:00
2 changed files with 18 additions and 0 deletions

6
targets.csv Executable file
View File

@ -0,0 +1,6 @@
phase,topleftx,toplefty,bottomrightx,bottomrighty
1,0,0,10,10
2,0,0,20,20
3,0,0,30,30
4,0,0,40,40
5,0,0,50,50
1 phase topleftx toplefty bottomrightx bottomrighty
2 1 0 0 10 10
3 2 0 0 20 20
4 3 0 0 30 30
5 4 0 0 40 40
6 5 0 0 50 50