From: Matt Davis <jiffyclub.programatic@gmail.com>
Date: Mon, 18 Jun 2012 01:49:26 +0000 (-0400)
Subject: Removing or moving old UofC directories.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4287418490d795bf2f0fc28847a9ffd80194518;p=swc-testing-nose.git

Removing or moving old UofC directories.

W. Trevor King: I dropped everything from the original 500753d except
for the 4-SoftwareEngineering/Testing/ renaming.

Conflicts:
	4-SoftwareEngineering/Debugging/Readme.md
	4-SoftwareEngineering/Debugging/Readme.rst
	4-SoftwareEngineering/Debugging/cacheTest.cc
	4-SoftwareEngineering/Debugging/lint_example.py
	4-SoftwareEngineering/Debugging/pdb_example.py
	4-SoftwareEngineering/Debugging/profiler_example.py
	4-SoftwareEngineering/Debugging/segfault_handled_example.py
	4-SoftwareEngineering/Debugging/segfault_unhandled_example.py
	4-SoftwareEngineering/Debugging/simpleTest.cc
	4-SoftwareEngineering/Debugging/style_example.py
	4-SoftwareEngineering/Debugging/tb_example.py
	4-SoftwareEngineering/Documentation/Makefile
	4-SoftwareEngineering/Documentation/Readme.md
	4-SoftwareEngineering/Documentation/Readme.rst
	4-SoftwareEngineering/Documentation/_static/flash.ico
	4-SoftwareEngineering/Documentation/_static/thwlogo-small.png
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/layout.html
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/cloud.css_t
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-note.png
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-seealso.png
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-todo.png
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/icon-warning.png
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/jquery.cookie.js
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/toggle_sections.js
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/static/toggle_sidebar.js_t
	4-SoftwareEngineering/Documentation/_themes/cloud_flash/theme.conf
	4-SoftwareEngineering/Documentation/close_line.rst
	4-SoftwareEngineering/Documentation/conf.py
	4-SoftwareEngineering/Documentation/index.rst
	4-SoftwareEngineering/Documentation/sphinxext/LICENSE.txt
	4-SoftwareEngineering/Documentation/sphinxext/__init__.py
	4-SoftwareEngineering/Documentation/sphinxext/apigen.py
	4-SoftwareEngineering/Documentation/sphinxext/comment_eater.py
	4-SoftwareEngineering/Documentation/sphinxext/compiler_unparse.py
	4-SoftwareEngineering/Documentation/sphinxext/docscrape.py
	4-SoftwareEngineering/Documentation/sphinxext/docscrape.pyc
	4-SoftwareEngineering/Documentation/sphinxext/docscrape_sphinx.py
	4-SoftwareEngineering/Documentation/sphinxext/docscrape_sphinx.pyc
	4-SoftwareEngineering/Documentation/sphinxext/inheritance_diagram.py
	4-SoftwareEngineering/Documentation/sphinxext/ipython_console_highlighting.py
	4-SoftwareEngineering/Documentation/sphinxext/ipython_console_highlighting.pyc
	4-SoftwareEngineering/Documentation/sphinxext/ipython_directive.py
	4-SoftwareEngineering/Documentation/sphinxext/numpydoc.py
	4-SoftwareEngineering/Documentation/sphinxext/numpydoc.pyc
	4-SoftwareEngineering/Documentation/sphinxext/phantom_import.py
	4-SoftwareEngineering/Documentation/sphinxext/plot_directive.py
	4-SoftwareEngineering/Documentation/sphinxext/setup.py
	4-SoftwareEngineering/Documentation/sphinxext/traitsdoc.py
	4-SoftwareEngineering/Testing/close_line.py
---

diff --git a/5-Testing/Readme.md b/4-SoftwareEngineering/Testing/Readme.md
similarity index 100%
rename from 5-Testing/Readme.md
rename to 4-SoftwareEngineering/Testing/Readme.md
diff --git a/5-Testing/Readme.rst b/4-SoftwareEngineering/Testing/Readme.rst
similarity index 100%
rename from 5-Testing/Readme.rst
rename to 4-SoftwareEngineering/Testing/Readme.rst
diff --git a/5-Testing/close_line.py b/4-SoftwareEngineering/Testing/close_line.py
similarity index 100%
rename from 5-Testing/close_line.py
rename to 4-SoftwareEngineering/Testing/close_line.py
diff --git a/5-Testing/evo_sol1.png b/4-SoftwareEngineering/Testing/evo_sol1.png
similarity index 100%
rename from 5-Testing/evo_sol1.png
rename to 4-SoftwareEngineering/Testing/evo_sol1.png
diff --git a/5-Testing/mean.py b/4-SoftwareEngineering/Testing/mean.py
similarity index 100%
rename from 5-Testing/mean.py
rename to 4-SoftwareEngineering/Testing/mean.py
diff --git a/5-Testing/test_mean.py b/4-SoftwareEngineering/Testing/test_mean.py
similarity index 100%
rename from 5-Testing/test_mean.py
rename to 4-SoftwareEngineering/Testing/test_mean.py
diff --git a/5-Testing/test_prod.jpg b/4-SoftwareEngineering/Testing/test_prod.jpg
similarity index 100%
rename from 5-Testing/test_prod.jpg
rename to 4-SoftwareEngineering/Testing/test_prod.jpg