Eric Rowell 355c80088f resolved some more merge issues

2013-08-11 22:02:49 -07:00

..

special

updated build process. dev version no longer pulls the version number from the package.json file. It instead always uses dev. Also set some things up for -beta build support

2013-07-27 21:09:33 -07:00

filterTests.html

resolved some more merge issues

2013-08-11 22:02:49 -07:00

functionalTests.html

updated build process. dev version no longer pulls the version number from the package.json file. It instead always uses dev. Also set some things up for -beta build support

2013-07-27 21:09:33 -07:00

index.html

resolving conflicts

2013-08-11 21:36:18 -07:00

manualTests.html

updated build process. dev version no longer pulls the version number from the package.json file. It instead always uses dev. Also set some things up for -beta build support

2013-07-27 21:09:33 -07:00

performanceTests.html

resolving conflicts

2013-08-11 21:36:18 -07:00

unitTests.html

updated build process. dev version no longer pulls the version number from the package.json file. It instead always uses dev. Also set some things up for -beta build support

2013-07-27 21:09:33 -07:00

visualTests.html

updated build process. dev version no longer pulls the version number from the package.json file. It instead always uses dev. Also set some things up for -beta build support

2013-07-27 21:09:33 -07:00