From: Yaroslav Halchenko <debian@onerussian.com>
Date: Thu, 19 May 2011 20:38:23 +0000 (-0400)
Subject: Merge branch 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian
X-Git-Url: https://git.donarmstrong.com/?p=neurodebian.git;a=commitdiff_plain;h=c5e6c9ca5fc63b729547572f366459040b30bdeb

Merge branch 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian:
  Add Superlab.

Conflicts:
	survey/survey.rst  -- cogent vs superlab
---

c5e6c9ca5fc63b729547572f366459040b30bdeb
diff --cc survey/survey.rst
index d8a5a7b,65c322e..7010956
--- a/survey/survey.rst
+++ b/survey/survey.rst
@@@ -945,13 -944,14 +945,14 @@@ Psychophysics/Experiment contro
     <td class="response"><input type="checkbox" name="sw_psychphys" value="opensesame" />OpenSesame</td>
     <td class="response"><input type="checkbox" name="sw_psychphys" value="presentation" />Presentation</td>
     <td class="response"><input type="checkbox" name="sw_psychphys" value="psychopy" />PsychoPy</td>
 -   <td class="response"><input type="checkbox" name="sw_psychphys" value="pyepl" />PyEPL</td>
--   </tr><tr class="oddrow">
     <td class="response"><input type="checkbox" name="sw_psychphys" value="psychtoolbox" />Psychtoolbox</td>
 -   <td class="response"><input type="checkbox" name="sw_psychphys" value="psytoolkit" />Psytoolkit</td>
++   </tr><tr class="oddrow">
     <td class="response"><input type="checkbox" name="sw_psychphys" value="psyscope" />PsyScope</td>
 +   <td class="response"><input type="checkbox" name="sw_psychphys" value="psytoolkit" />Psytoolkit</td>
 +   <td class="response"><input type="checkbox" name="sw_psychphys" value="pyepl" />PyEPL</td>
+    <td class="response"><input type="checkbox" name="sw_psychphys" value="superlab" />SuperLab</td>
 -   <td class="response"><input type="checkbox" name="sw_psychphys" value="visionegg" />VisionEgg</td>
     <td class="response"><input type="checkbox" name="sw_psychphys" value="tscope" />Tscope</td>
 +   <td class="response"><input type="checkbox" name="sw_psychphys" value="visionegg" />VisionEgg</td>
     </tr></table>
  
  Other