gistfile1.txt

804d8f2 HEAD@{0}: checkout: moving from master to input_refactor_4664
422df39 HEAD@{1}: pull : Fast forward
804d8f2 HEAD@{0}: checkout: moving from master to input_refactor_4664
804d8f2 HEAD@{0}: checkout: moving from master to input_refactor_4664
422df39 HEAD@{1}: pull : Fast forward
95b1e56 HEAD@{2}: checkout: moving from 57bc4b4b0e698f808df979ceaec922777196aa03 to master
804d8f2 HEAD@{0}: checkout: moving from master to input_refactor_4664
422df39 HEAD@{1}: pull : Fast forward
95b1e56 HEAD@{2}: checkout: moving from 57bc4b4b0e698f808df979ceaec922777196aa03 to master
57bc4b4 HEAD@{3}: checkout: moving from input_refactor_4664 to 57bc4b4b0e698f808df979ceaec922777196aa03
804d8f2 HEAD@{4}: checkout: moving from master to input_refactor_4664
95b1e56 HEAD@{5}: merge ian_4629: Fast forward
cacbfd6 HEAD@{6}: pull : Fast forward
dd27643 HEAD@{7}: checkout: moving from ian_4629 to master
95b1e56 HEAD@{8}: merge origin master: Merge made by octopus.
f6c9300 HEAD@{9}: commit (merge): refs #4629 - merge with master
cda7da6 HEAD@{10}: checkout: moving from input_refactor_4664 to ian_4629
804d8f2 HEAD@{11}: commit (merge): refs 4664 - merge
57bc4b4 HEAD@{12}: commit: refs #4664 - more work on input refactoring
ac970c1 HEAD@{13}: commit: refs #4664 - worked on inputtypes for cookbooks
520ae3a HEAD@{14}: commit: refs #4664 - fixed diffing and merging for rightscripts and the new inputtype class
0a648a0 HEAD@{15}: commit: refs #4664 got identifying inputs mostly working. still missing: enabling the checkbox of a previously disabled input does not brin
3a06d3a HEAD@{16}: commit: refs #4664 - added a few tests. work in the UI and controllers to support the InputType
87a4823 HEAD@{17}: checkout: moving from ian_4629 to input_refactor_4664
cda7da6 HEAD@{18}: checkout: moving from input_refactor_4664 to ian_4629
87a4823 HEAD@{19}: checkout: moving from ian_4629 to input_refactor_4664
cda7da6 HEAD@{20}: merge origin/master: Merge made by recursive.