[OpenSmalltalk/opensmalltalk-vm] 148e5a: Merge commit 'f155ee36a5c843c9f01c1ffc3b32399fdeb3...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[OpenSmalltalk/opensmalltalk-vm] 148e5a: Merge commit 'f155ee36a5c843c9f01c1ffc3b32399fdeb3...

GitHub
 
  Branch: refs/heads/Cog
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: 148e5a288f56e2ff8f1ffbe9f877423a290079d4
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/148e5a288f56e2ff8f1ffbe9f877423a290079d4
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M .appveyor.yml
    M .travis.yml
    M deploy/pharo/deploy-key.sh
    A deploy/pharo/filter-exec.sh
    M deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  Merge commit 'f155ee36a5c843c9f01c1ffc3b32399fdeb32720'

# Conflicts:
# opensmalltalk-vm/.appveyor.yml
# opensmalltalk-vm/.travis.yml
# opensmalltalk-vm/deploy/pharo/deploy-key.sh
# opensmalltalk-vm/deploy/pharo/pack-vm.sh


  Commit: 72f4f3100d5fe64b1d39274ca834b4309f9d4426
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/72f4f3100d5fe64b1d39274ca834b4309f9d4426
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    R deploy/pharo/deploy-files.pharo.org-appveyor.sh

  Log Message:
  -----------
  remove unnecesary file


  Commit: 69a5e59f93e79e934e04bfeefd30d6dc31977af2
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/69a5e59f93e79e934e04bfeefd30d6dc31977af2
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M platforms/unix/vm/sqUnixHeartbeat.c

  Log Message:
  -----------
  enhance threaded missing rights to change priority message


  Commit: 0e1fc3adf468beebab9583da554c828e2f899d44
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0e1fc3adf468beebab9583da554c828e2f899d44
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M platforms/unix/vm/sqUnixHeartbeat.c

  Log Message:
  -----------
  Merge pull request #132 from estebanlm/CogLatestTree

improve linux Threaded Heartbeat VM text and instructions


Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/f155ee36a5c8...0e1fc3adf468
Loading...