[pharo-project/pharo-core] 0fcf6b: 40613

  Branch: refs/heads/4.0
  Home:   https://github.com/pharo-project/pharo-core
  Commit: 0fcf6b685e436d757b81f237494207ccf5efc4ef
      https://github.com/pharo-project/pharo-core/commit/0fcf6b685e436d757b81f237494207ccf5efc4ef
  Author: Jenkins Build Server <[hidden email]>
  Date:   2015-05-05 (Tue, 05 May 2015)

  Changed paths:
    A Kernel.package/DelayWaitTimeout.class/instance/waiting/waitOnCompletion_onTimeout_.st
    A Kernel.package/Semaphore.class/instance/communication/waitTimeoutSeconds_onCompletion_onTimeout_.st
    A KernelTests.package/SemaphoreTest.class/instance/tests/testWaitTimeoutSecondsOnCompletionOnTimeout.st
    M OpalCompiler-Core.package/extension/RBBlockNode/instance/sourceNodeForPC_.st
    R ScriptLoader40.package/ScriptLoader.class/instance/pharo - scripts/script612.st
    A ScriptLoader40.package/ScriptLoader.class/instance/pharo - scripts/script613.st
    R ScriptLoader40.package/ScriptLoader.class/instance/pharo - updates/update40612.st
    A ScriptLoader40.package/ScriptLoader.class/instance/pharo - updates/update40613.st
    M ScriptLoader40.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st
    M Shout.package/SHTextStyler.class/instance/styling/styleInBackgroundProcess_.st
    M Tool-Base.package/AbstractTool.class/instance/group/mergeGroups_.st

  Log Message:
  -----------
  40613
15423 Backport Pharo4: 15422 SHTextStyler>>#styleInBackgroundProcess: should not set the text if styling process was terminated
        https://pharo.fogbugz.com/f/cases/15423

15492 Backport Nautilus MergeGroups + sourceNodeForPC should use #methodNode
        https://pharo.fogbugz.com/f/cases/15492

http://files.pharo.org/image/40/40613.zip