From: Jon Pipitone <jon.pipitone@utoronto.ca>
Date: Mon, 4 Mar 2013 19:31:26 +0000 (-0500)
Subject: Moved exercises into subfolders of the corresponding topics
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5642210f88119e3bfa83765df43f8498f3647533;p=swc-testing-nose.git

Moved exercises into subfolders of the corresponding topics

W. Trevor King: I dropped everything from the original 39e0701 except
for the python/testing/exercises/test.markdown rename.

Conflicts:
	python/data_structures/exercises/setdict.markdown
	python/data_structures/exercises/setdict_dependencies.txt
	python/intro/exercises/python.markdown
	python/obj_orientation/exercises/oop.markdown
	python/obj_orientation/exercises/oop_sushi.txt
	python/regexp/exercises/regexp.markdown
	python/sw_engineering/argparse_exercise.md
	shell/exercises/1000gp.vcf
	shell/exercises/shell.markdown
	spreadsheets/exercises/spreadsheets.markdown
	spreadsheets/exercises/spreadsheets_ex1.xls
	spreadsheets/exercises/spreadsheets_ex2.xls
	spreadsheets/exercises/spreadsheets_ex3.xls
	sql/exercises/aggregation.markdown
	sql/exercises/experiments.sqlite
	sql/exercises/experiments_null.sqlite
	sql/exercises/experiments_subqueries.sqlite
	sql/exercises/filter.markdown
	sql/exercises/intro.markdown
	sql/exercises/join.markdown
	sql/exercises/nobel_prizes.sqlite
	sql/exercises/null.markdown
	sql/exercises/select.markdown
	sql/exercises/sort.markdown
	sql/exercises/subqueries.markdown
	version-control/svn/exercises/exercise_4.cgi
	version-control/svn/exercises/planets.txt
	version-control/svn/exercises/svn.markdown
	version-control/svn/exercises/temperature.txt
---

diff --git a/exercises/test.markdown b/python/testing/exercises/test.markdown
similarity index 100%
rename from exercises/test.markdown
rename to python/testing/exercises/test.markdown