W. Trevor King: I dropped everything from the original
282ce05 except
for the 09-testing/ renames.
Conflicts:
01-shell/Readme.md
01-shell/data/Bert/audioresult-00215
01-shell/data/Bert/audioresult-00222
01-shell/data/Bert/audioresult-00223
01-shell/data/Bert/audioresult-00235
01-shell/data/Bert/audioresult-00239
01-shell/data/Bert/audioresult-00246
01-shell/data/Bert/audioresult-00265
01-shell/data/Bert/audioresult-00267
01-shell/data/Bert/audioresult-00270
01-shell/data/Bert/audioresult-00286
01-shell/data/Bert/audioresult-00304
01-shell/data/Bert/audioresult-00317
01-shell/data/Bert/audioresult-00319
01-shell/data/Bert/audioresult-00320
01-shell/data/Bert/audioresult-00321
01-shell/data/Bert/audioresult-00330
01-shell/data/Bert/audioresult-00332
01-shell/data/Bert/audioresult-00350
01-shell/data/Bert/audioresult-00353
01-shell/data/Bert/audioresult-00355
01-shell/data/Bert/audioresult-00359
01-shell/data/Bert/audioresult-00372
01-shell/data/Bert/audioresult-00377
01-shell/data/Bert/audioresult-00380
01-shell/data/Bert/audioresult-00384
01-shell/data/Bert/audioresult-00386
01-shell/data/Bert/audioresult-00393
01-shell/data/Bert/audioresult-00412
01-shell/data/Bert/audioresult-00416
01-shell/data/Bert/audioresult-00422
01-shell/data/Bert/audioresult-00443
01-shell/data/Bert/audioresult-00445
01-shell/data/Bert/audioresult-00451
01-shell/data/Bert/audioresult-00453
01-shell/data/Bert/audioresult-00460
01-shell/data/Bert/audioresult-00466
01-shell/data/Bert/audioresult-00470
01-shell/data/Bert/audioresult-00472
01-shell/data/Bert/audioresult-00490
01-shell/data/Bert/audioresult-00493
01-shell/data/Bert/audioresult-00497
01-shell/data/Bert/audioresult-00518
01-shell/data/Bert/audioresult-00521
01-shell/data/Bert/audioresult-00532
01-shell/data/Bert/audioresult-00534
01-shell/data/Bert/audioresult-00535
01-shell/data/Bert/audioresult-00557
01-shell/data/Frank_Richard/NOTES
01-shell/data/Frank_Richard/data_212
01-shell/data/Frank_Richard/data_221
01-shell/data/Frank_Richard/data_224
01-shell/data/Frank_Richard/data_233
01-shell/data/Frank_Richard/data_237
01-shell/data/Frank_Richard/data_247
01-shell/data/Frank_Richard/data_252
01-shell/data/Frank_Richard/data_254
01-shell/data/Frank_Richard/data_258
01-shell/data/Frank_Richard/data_259
01-shell/data/Frank_Richard/data_272
01-shell/data/Frank_Richard/data_273
01-shell/data/Frank_Richard/data_285
01-shell/data/Frank_Richard/data_291
01-shell/data/Frank_Richard/data_295
01-shell/data/Frank_Richard/data_316
01-shell/data/Frank_Richard/data_323
01-shell/data/Frank_Richard/data_327
01-shell/data/Frank_Richard/data_329
01-shell/data/Frank_Richard/data_366
01-shell/data/Frank_Richard/data_378
01-shell/data/Frank_Richard/data_381
01-shell/data/Frank_Richard/data_385
01-shell/data/Frank_Richard/data_388
01-shell/data/Frank_Richard/data_398
01-shell/data/Frank_Richard/data_404
01-shell/data/Frank_Richard/data_405
01-shell/data/Frank_Richard/data_417
01-shell/data/Frank_Richard/data_428
01-shell/data/Frank_Richard/data_429
01-shell/data/Frank_Richard/data_433
01-shell/data/Frank_Richard/data_436
01-shell/data/Frank_Richard/data_439
01-shell/data/Frank_Richard/data_444
01-shell/data/Frank_Richard/data_461
01-shell/data/Frank_Richard/data_477
01-shell/data/Frank_Richard/data_479
01-shell/data/Frank_Richard/data_491
01-shell/data/Frank_Richard/data_494
01-shell/data/Frank_Richard/data_500
01-shell/data/Frank_Richard/data_503
01-shell/data/Frank_Richard/data_504
01-shell/data/Frank_Richard/data_507
01-shell/data/Frank_Richard/data_508
01-shell/data/Frank_Richard/data_512
01-shell/data/Frank_Richard/data_519
01-shell/data/Frank_Richard/data_533
01-shell/data/Frank_Richard/data_537
01-shell/data/Frank_Richard/data_538
01-shell/data/Frank_Richard/data_540
01-shell/data/Frank_Richard/data_545
01-shell/data/Frank_Richard/data_555
01-shell/data/Lawrence/Data0214
01-shell/data/Lawrence/Data0225
01-shell/data/Lawrence/Data0234
01-shell/data/Lawrence/Data0248
01-shell/data/Lawrence/Data0251
01-shell/data/Lawrence/Data0253
01-shell/data/Lawrence/Data0260
01-shell/data/Lawrence/Data0271
01-shell/data/Lawrence/Data0275
01-shell/data/Lawrence/Data0276
01-shell/data/Lawrence/Data0284
01-shell/data/Lawrence/Data0296
01-shell/data/Lawrence/Data0300
01-shell/data/Lawrence/Data0310
01-shell/data/Lawrence/Data0313
01-shell/data/Lawrence/Data0335
01-shell/data/Lawrence/Data0345
01-shell/data/Lawrence/Data0352
01-shell/data/Lawrence/Data0361
01-shell/data/Lawrence/Data0362
01-shell/data/Lawrence/Data0363
01-shell/data/Lawrence/Data0371
01-shell/data/Lawrence/Data0382
01-shell/data/Lawrence/Data0390
01-shell/data/Lawrence/Data0392
01-shell/data/Lawrence/Data0400
01-shell/data/Lawrence/Data0403
01-shell/data/Lawrence/Data0410
01-shell/data/Lawrence/Data0411
01-shell/data/Lawrence/Data0423
01-shell/data/Lawrence/Data0430
01-shell/data/Lawrence/Data0437
01-shell/data/Lawrence/Data0440
01-shell/data/Lawrence/Data0441
01-shell/data/Lawrence/Data0442
01-shell/data/Lawrence/Data0447
01-shell/data/Lawrence/Data0449
01-shell/data/Lawrence/Data0452
01-shell/data/Lawrence/Data0455
01-shell/data/Lawrence/Data0456
01-shell/data/Lawrence/Data0463
01-shell/data/Lawrence/Data0483
01-shell/data/Lawrence/Data0492
01-shell/data/Lawrence/Data0506
01-shell/data/Lawrence/Data0511
01-shell/data/Lawrence/Data0515
01-shell/data/Lawrence/Data0522
01-shell/data/Lawrence/Data0525
01-shell/data/Lawrence/Data0526
01-shell/data/Lawrence/Data0531
01-shell/data/Lawrence/Data0544
01-shell/data/Lawrence/Data0554
01-shell/data/THOMAS/0213
01-shell/data/THOMAS/0241
01-shell/data/THOMAS/0244
01-shell/data/THOMAS/0249
01-shell/data/THOMAS/0274
01-shell/data/THOMAS/0281
01-shell/data/THOMAS/0287
01-shell/data/THOMAS/0289
01-shell/data/THOMAS/0298
01-shell/data/THOMAS/0299
01-shell/data/THOMAS/0301
01-shell/data/THOMAS/0302
01-shell/data/THOMAS/0303
01-shell/data/THOMAS/0314
01-shell/data/THOMAS/0315
01-shell/data/THOMAS/0322
01-shell/data/THOMAS/0328
01-shell/data/THOMAS/0333
01-shell/data/THOMAS/0334
01-shell/data/THOMAS/0336
01-shell/data/THOMAS/0340
01-shell/data/THOMAS/0341
01-shell/data/THOMAS/0348
01-shell/data/THOMAS/0349
01-shell/data/THOMAS/0351
01-shell/data/THOMAS/0354
01-shell/data/THOMAS/0358
01-shell/data/THOMAS/0369
01-shell/data/THOMAS/0373
01-shell/data/THOMAS/0376
01-shell/data/THOMAS/0391
01-shell/data/THOMAS/0396
01-shell/data/THOMAS/0399
01-shell/data/THOMAS/0406
01-shell/data/THOMAS/0425
01-shell/data/THOMAS/0431
01-shell/data/THOMAS/0432
01-shell/data/THOMAS/0435
01-shell/data/THOMAS/0438
01-shell/data/THOMAS/0448
01-shell/data/THOMAS/0450
01-shell/data/THOMAS/0464
01-shell/data/THOMAS/0465
01-shell/data/THOMAS/0467
01-shell/data/THOMAS/0481
01-shell/data/THOMAS/0482
01-shell/data/THOMAS/0484
01-shell/data/THOMAS/0485
01-shell/data/THOMAS/0488
01-shell/data/THOMAS/0501
01-shell/data/THOMAS/0513
01-shell/data/THOMAS/0514
01-shell/data/THOMAS/0539
01-shell/data/THOMAS/0561
01-shell/data/alexander/data_216.DATA
01-shell/data/alexander/data_242.DATA
01-shell/data/alexander/data_256.DATA
01-shell/data/alexander/data_262.DATA
01-shell/data/alexander/data_268.DATA
01-shell/data/alexander/data_277.DATA
01-shell/data/alexander/data_278.DATA
01-shell/data/alexander/data_288.DATA
01-shell/data/alexander/data_292.DATA
01-shell/data/alexander/data_297.DATA
01-shell/data/alexander/data_305.DATA
01-shell/data/alexander/data_306.DATA
01-shell/data/alexander/data_309.DATA
01-shell/data/alexander/data_318.DATA
01-shell/data/alexander/data_337.DATA
01-shell/data/alexander/data_339.DATA
01-shell/data/alexander/data_344.DATA
01-shell/data/alexander/data_346.DATA
01-shell/data/alexander/data_347.DATA
01-shell/data/alexander/data_357.DATA
01-shell/data/alexander/data_364.DATA
01-shell/data/alexander/data_379.DATA
01-shell/data/alexander/data_387.DATA
01-shell/data/alexander/data_389.DATA
01-shell/data/alexander/data_397.DATA
01-shell/data/alexander/data_402.DATA
01-shell/data/alexander/data_408.DATA
01-shell/data/alexander/data_415.DATA
01-shell/data/alexander/data_420.DATA
01-shell/data/alexander/data_421.DATA
01-shell/data/alexander/data_427.DATA
01-shell/data/alexander/data_434.DATA
01-shell/data/alexander/data_454.DATA
01-shell/data/alexander/data_462.DATA
01-shell/data/alexander/data_469.DATA
01-shell/data/alexander/data_471.DATA
01-shell/data/alexander/data_473.DATA
01-shell/data/alexander/data_498.DATA
01-shell/data/alexander/data_502.DATA
01-shell/data/alexander/data_516.DATA
01-shell/data/alexander/data_527.DATA
01-shell/data/alexander/data_530.DATA
01-shell/data/alexander/data_536.DATA
01-shell/data/alexander/data_542.DATA
01-shell/data/alexander/data_546.DATA
01-shell/data/alexander/data_547.DATA
01-shell/data/alexander/data_548.DATA
01-shell/data/alexander/data_550.DATA
01-shell/data/alexander/data_560.DATA
01-shell/data/gerdal/Data0211
01-shell/data/gerdal/Data0218
01-shell/data/gerdal/Data0220
01-shell/data/gerdal/Data0227
01-shell/data/gerdal/Data0229
01-shell/data/gerdal/Data0230
01-shell/data/gerdal/Data0232
01-shell/data/gerdal/Data0238
01-shell/data/gerdal/Data0240
01-shell/data/gerdal/Data0243
01-shell/data/gerdal/Data0245
01-shell/data/gerdal/Data0250
01-shell/data/gerdal/Data0257
01-shell/data/gerdal/Data0263
01-shell/data/gerdal/Data0269
01-shell/data/gerdal/Data0279
01-shell/data/gerdal/Data0283
01-shell/data/gerdal/Data0294
01-shell/data/gerdal/Data0307
01-shell/data/gerdal/Data0308
01-shell/data/gerdal/Data0311
01-shell/data/gerdal/Data0324
01-shell/data/gerdal/Data0331
01-shell/data/gerdal/Data0338
01-shell/data/gerdal/Data0342
01-shell/data/gerdal/Data0356
01-shell/data/gerdal/Data0365
01-shell/data/gerdal/Data0367
01-shell/data/gerdal/Data0370
01-shell/data/gerdal/Data0407
01-shell/data/gerdal/Data0409
01-shell/data/gerdal/Data0413
01-shell/data/gerdal/Data0414
01-shell/data/gerdal/Data0419
01-shell/data/gerdal/Data0424
01-shell/data/gerdal/Data0426
01-shell/data/gerdal/Data0446
01-shell/data/gerdal/Data0458
01-shell/data/gerdal/Data0459
01-shell/data/gerdal/Data0468
01-shell/data/gerdal/Data0486
01-shell/data/gerdal/Data0487
01-shell/data/gerdal/Data0495
01-shell/data/gerdal/Data0499
01-shell/data/gerdal/Data0505
01-shell/data/gerdal/Data0520
01-shell/data/gerdal/Data0523
01-shell/data/gerdal/Data0528
01-shell/data/gerdal/Data0529
01-shell/data/gerdal/Data0541
01-shell/data/gerdal/Data0543
01-shell/data/gerdal/Data0549
01-shell/data/gerdal/Data0551
01-shell/data/gerdal/Data0552
01-shell/data/gerdal/Data0556
01-shell/data/gerdal/Data0558
01-shell/data/gerdal/Data0559
01-shell/data/jamesm/NOTES
01-shell/data/jamesm/data_217.txt
01-shell/data/jamesm/data_219.txt
01-shell/data/jamesm/data_226.txt
01-shell/data/jamesm/data_228.txt
01-shell/data/jamesm/data_231.txt
01-shell/data/jamesm/data_236.txt
01-shell/data/jamesm/data_255.txt
01-shell/data/jamesm/data_261.txt
01-shell/data/jamesm/data_264.txt
01-shell/data/jamesm/data_266.txt
01-shell/data/jamesm/data_280.txt
01-shell/data/jamesm/data_282.txt
01-shell/data/jamesm/data_290.txt
01-shell/data/jamesm/data_293.txt
01-shell/data/jamesm/data_312.txt
01-shell/data/jamesm/data_325.txt
01-shell/data/jamesm/data_326.txt
01-shell/data/jamesm/data_343.txt
01-shell/data/jamesm/data_360.txt
01-shell/data/jamesm/data_368.txt
01-shell/data/jamesm/data_374.txt
01-shell/data/jamesm/data_375.txt
01-shell/data/jamesm/data_383.txt
01-shell/data/jamesm/data_394.txt
01-shell/data/jamesm/data_395.txt
01-shell/data/jamesm/data_401.txt
01-shell/data/jamesm/data_418.txt
01-shell/data/jamesm/data_457.txt
01-shell/data/jamesm/data_474.txt
01-shell/data/jamesm/data_475.txt
01-shell/data/jamesm/data_476.txt
01-shell/data/jamesm/data_478.txt
01-shell/data/jamesm/data_480.txt
01-shell/data/jamesm/data_489.txt
01-shell/data/jamesm/data_496.txt
01-shell/data/jamesm/data_509.txt
01-shell/data/jamesm/data_510.txt
01-shell/data/jamesm/data_517.txt
01-shell/data/jamesm/data_524.txt
01-shell/data/jamesm/data_553.txt
01-shell/dictionary.txt
01-shell/ex_data.txt
01-shell/exercises/1000gp.vcf
01-shell/exercises/shell.markdown
01-shell/generate_data.py
01-shell/hello
01-shell/shell_cheatsheet.md
02-python-variables/Readme.md
02-python-variables/hello.py
02-python-variables/richie.txt
02-python-variables/variables.ipynb
03-python-data-structures/Readme.md
03-python-data-structures/data.dat
03-python-data-structures/data_structures.ipynb
03-python-data-structures/data_structures.py
03-python-data-structures/exercises.ipynb
03-python-data-structures/exercises.py
03-python-data-structures/exercises/setdict.markdown
03-python-data-structures/exercises/setdict_dependencies.txt
04-python-flow-control/Readme.md
04-python-flow-control/example.txt
04-python-flow-control/flow_control.py
04-python-flow-control/genos.txt
04-python-flow-control/phonenums/phonenums.txt
04-python-flow-control/python_flow_control.ipynb
05-python-functions/Readme.md
05-python-functions/functions_and_modules.py
05-python-functions/python_functions_and_modules.ipynb
06-version-control-local/Readme.md
07-version-control-remote/Readme.md
08-debugging/Readme.md
08-debugging/basic_exceptions/index_error.py
08-debugging/basic_exceptions/io_error.py
08-debugging/basic_exceptions/key_error.py
08-debugging/basic_exceptions/name_error.py
08-debugging/basic_exceptions/syntax_error.py
08-debugging/basic_exceptions/type_error.py
08-debugging/basic_exceptions/value_error.py
08-debugging/conways_game_of_life/1_conway_pre_linted.py
08-debugging/conways_game_of_life/2_conway_pre_formatted.py
08-debugging/conways_game_of_life/3_conway_pre_debugged.py
08-debugging/conways_game_of_life/4_conway_pre_profiled.py
08-debugging/conways_game_of_life/5_conway_final.py
08-debugging/conways_game_of_life/Conway's Game of Life - Debugging Example.ipynb
08-debugging/examples/linting_example.py
08-debugging/examples/pdb_example.py
08-debugging/examples/profiler_example.py
08-debugging/examples/segfault.py
08-debugging/examples/style_example.py
10-numpy/NumPy.ipynb
10-numpy/Readme.md
10-numpy/engine/recommend.py
10-numpy/engine/segaran-recommend.py
10-numpy/long_exercise.md
projects / swc-testing-nose.git / commitdiff
