Merge remote-tracking branch 'origin/master'

2012-08-16 13:21:49 +04:00
parent 06160d0897 0b054f224c
commit ced3209170
148 changed files with 2992 additions and 3016 deletions
@@ -23,7 +23,13 @@
    </option>
    <envs />
    <patterns />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
    <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
    <ConfigurationWrapper RunnerId="Run" />
    <method />
  </configuration>