[OpenSmalltalk/opensmalltalk-vm] db10a7: Merge commit '2e46c8cc2f9300af05e131829f3f5669c335...

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] db10a7: Merge commit '2e46c8cc2f9300af05e131829f3f5669c335...

GitHub
 
  Branch: refs/heads/Cog
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: db10a70165cf22d7e5da69e0d724d6deb587b540
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/db10a70165cf22d7e5da69e0d724d6deb587b540
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M .appveyor.yml
    M build.win32x86/common/Makefile.lib.extra
    M build.win32x86/pharo.cog.spur.lowcode/Makefile
    M build.win32x86/pharo.cog.spur.lowcode/Pharo.exe.manifest
    M build.win32x86/pharo.cog.spur.lowcode/Pharo.rc
    M build.win32x86/pharo.cog.spur.lowcode/mvm
    M build.win32x86/pharo.cog.spur/Makefile
    M build.win32x86/pharo.cog.spur/mvm
    M build.win32x86/third-party/Makefile.cairo
    M build.win32x86/third-party/Makefile.freetype2
    M build.win32x86/third-party/Makefile.libgcc
    M build.win32x86/third-party/Makefile.libgit2
    M build.win32x86/third-party/Makefile.libpng
    M build.win32x86/third-party/Makefile.libsdl2
    M build.win32x86/third-party/Makefile.libssh2
    M build.win32x86/third-party/Makefile.openssl
    M build.win32x86/third-party/Makefile.pixman
    M build.win32x86/third-party/Makefile.pkgconfig
    M build.win32x86/third-party/Makefile.zlib
    A build.win32x86/third-party/Toolchain-cross-mingw32-cygwin.cmake
    M build.win64x64/common/Makefile
    A build.win64x64/common/Makefile.lib.extra
    M build.win64x64/common/Makefile.tools
    A build.win64x64/pharo.stack.spur/Makefile
    A build.win64x64/pharo.stack.spur/Pharo.def.in
    A build.win64x64/pharo.stack.spur/Pharo.exe.manifest
    A build.win64x64/pharo.stack.spur/Pharo.ico
    A build.win64x64/pharo.stack.spur/Pharo.rc
    A build.win64x64/pharo.stack.spur/mvm
    A build.win64x64/pharo.stack.spur/plugins.ext
    A build.win64x64/pharo.stack.spur/plugins.int
    A build.win64x64/third-party/Makefile.cairo
    A build.win64x64/third-party/Makefile.freetype2
    A build.win64x64/third-party/Makefile.libgcc
    A build.win64x64/third-party/Makefile.libgit2
    A build.win64x64/third-party/Makefile.libpng
    A build.win64x64/third-party/Makefile.libsdl2
    A build.win64x64/third-party/Makefile.libssh2
    A build.win64x64/third-party/Makefile.openssl
    A build.win64x64/third-party/Makefile.pixman
    A build.win64x64/third-party/Makefile.pkgconfig
    A build.win64x64/third-party/Makefile.zlib
    A build.win64x64/third-party/Toolchain-cross-mingw32-cygwin.cmake
    M nsspur64src/vm/cointerp.c
    M nsspur64src/vm/cointerp.h
    M nsspur64src/vm/gcc3x-cointerp.c
    M nsspursrc/vm/cointerp.c
    M nsspursrc/vm/cointerp.h
    M nsspursrc/vm/gcc3x-cointerp.c
    M nsspurstack64src/vm/gcc3x-interp.c
    M nsspurstack64src/vm/interp.c
    M nsspurstacksrc/vm/gcc3x-interp.c
    M nsspurstacksrc/vm/interp.c
    M platforms/Cross/vm/sq.h
    M platforms/unix/vm/aio.c
    M platforms/win32/plugins/Mpeg3Plugin/Makefile.win32
    M platforms/win32/plugins/SqueakSSL/Makefile
    M platforms/win32/plugins/SqueakSSL/Makefile.plugin
    M platforms/win32/vm/sqWin32Window.c
    M spur64src/vm/cointerp.c
    M spur64src/vm/cointerp.h
    M spur64src/vm/gcc3x-cointerp.c
    M spurlowcode64src/vm/cointerp.c
    M spurlowcode64src/vm/cointerp.h
    M spurlowcode64src/vm/gcc3x-cointerp.c
    M spurlowcodesrc/vm/cointerp.c
    M spurlowcodesrc/vm/cointerp.h
    M spurlowcodesrc/vm/gcc3x-cointerp.c
    M spurlowcodestack64src/vm/gcc3x-interp.c
    M spurlowcodestack64src/vm/interp.c
    M spurlowcodestacksrc/vm/gcc3x-interp.c
    M spurlowcodestacksrc/vm/interp.c
    M spursista64src/vm/cointerp.c
    M spursista64src/vm/cointerp.h
    M spursista64src/vm/gcc3x-cointerp.c
    M spursistasrc/vm/cointerp.c
    M spursistasrc/vm/cointerp.h
    M spursistasrc/vm/gcc3x-cointerp.c
    M spursrc/vm/cointerp.c
    M spursrc/vm/cointerp.h
    M spursrc/vm/gcc3x-cointerp.c
    M spurstack64src/vm/gcc3x-interp.c
    M spurstack64src/vm/interp.c
    M spurstacksrc/vm/gcc3x-interp.c
    M spurstacksrc/vm/interp.c
    M src/vm/cointerp.c
    M src/vm/cointerp.h
    M src/vm/cointerpmt.c
    M src/vm/cointerpmt.h
    M src/vm/gcc3x-cointerp.c
    M src/vm/gcc3x-cointerpmt.c
    M stacksrc/vm/gcc3x-interp.c
    M stacksrc/vm/interp.c
    M third-party/cairo.spec
    M third-party/freetype2.spec
    M third-party/libpng.spec.win
    M third-party/libsdl2.spec

  Log Message:
  -----------
  Merge commit '2e46c8cc2f9300af05e131829f3f5669c33570f4'

# Conflicts:
# opensmalltalk-vm/third-party/libpng.spec.win


  Commit: 40d2fbb0d2a84aa1eb41bee793637efe9c7db554
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/40d2fbb0d2a84aa1eb41bee793637efe9c7db554
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-20 (Mon, 20 Mar 2017)

  Changed paths:
    M nsspur64src/vm/cogit.c
    M nsspur64src/vm/cogit.h
    R nsspur64src/vm/cogitX64.c
    A nsspur64src/vm/cogitX64SysV.c
    A nsspur64src/vm/cogitX64WIN64.c
    M nsspursrc/vm/cogit.h
    M nsspursrc/vm/cogitARMv5.c
    M nsspursrc/vm/cogitIA32.c
    M nsspursrc/vm/cogitMIPSEL.c
    M spur64src/vm/cogit.c
    M spur64src/vm/cogit.h
    R spur64src/vm/cogitX64.c
    A spur64src/vm/cogitX64SysV.c
    A spur64src/vm/cogitX64WIN64.c
    M spurlowcode64src/vm/cogit.c
    M spurlowcode64src/vm/cogit.h
    R spurlowcode64src/vm/cogitX64.c
    A spurlowcode64src/vm/cogitX64SysV.c
    A spurlowcode64src/vm/cogitX64WIN64.c
    M spurlowcodesrc/vm/cogit.h
    M spurlowcodesrc/vm/cogitARMv5.c
    M spurlowcodesrc/vm/cogitIA32.c
    M spurlowcodesrc/vm/cogitMIPSEL.c
    M spursista64src/vm/cogit.c
    M spursista64src/vm/cogit.h
    R spursista64src/vm/cogitX64.c
    A spursista64src/vm/cogitX64SysV.c
    A spursista64src/vm/cogitX64WIN64.c
    M spursistasrc/vm/cogit.h
    M spursistasrc/vm/cogitARMv5.c
    M spursistasrc/vm/cogitIA32.c
    M spursistasrc/vm/cogitMIPSEL.c
    M spursrc/vm/cogit.h
    M spursrc/vm/cogitARMv5.c
    M spursrc/vm/cogitIA32.c
    M spursrc/vm/cogitMIPSEL.c
    M src/vm/cogit.h
    M src/vm/cogitARMv5.c
    M src/vm/cogitIA32.c
    M src/vm/cogitMIPSEL.c

  Log Message:
  -----------
  Merge commit '82bdfe3aa2f91f0e71fa78fde961717f28fa25b3'


  Commit: 5db8019c8584b8087e44b2f0d5cd765580a5fc7d
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5db8019c8584b8087e44b2f0d5cd765580a5fc7d
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

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

  Log Message:
  -----------
  Merge commit '222d36744061772df74962327ee3429cb3fc939f'


  Commit: f07cddeff1968f192d56ff8402d53b0cc775a32f
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/f07cddeff1968f192d56ff8402d53b0cc775a32f
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M third-party/libsdl2.spec

  Log Message:
  -----------
  linux SDL2 filename is still 0.4.1, even if library is 0.5.0
don’t ask why


  Commit: 67efc2e971962fe2e1c16573b4b9d6aa260e08ab
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/67efc2e971962fe2e1c16573b4b9d6aa260e08ab
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-22 (Wed, 22 Mar 2017)

  Changed paths:
    M nsspur64src/vm/cogit.h
    M nsspur64src/vm/cointerp.c
    M nsspur64src/vm/cointerp.h
    M nsspur64src/vm/gcc3x-cointerp.c
    M nsspursrc/vm/cogit.h
    M nsspursrc/vm/cointerp.c
    M nsspursrc/vm/cointerp.h
    M nsspursrc/vm/gcc3x-cointerp.c
    M nsspurstack64src/vm/gcc3x-interp.c
    M nsspurstack64src/vm/interp.c
    M nsspurstacksrc/vm/gcc3x-interp.c
    M nsspurstacksrc/vm/interp.c
    M platforms/unix/plugins/XDisplayControlPlugin/Makefile.inc
    M platforms/unix/vm/sqUnixHeartbeat.c
    M scripts/gitrevert
    M spur64src/vm/cogit.h
    M spur64src/vm/cointerp.c
    M spur64src/vm/cointerp.h
    M spur64src/vm/gcc3x-cointerp.c
    M spurlowcode64src/vm/cogit.h
    M spurlowcode64src/vm/cointerp.c
    M spurlowcode64src/vm/cointerp.h
    M spurlowcode64src/vm/gcc3x-cointerp.c
    M spurlowcodesrc/vm/cogit.h
    M spurlowcodesrc/vm/cointerp.c
    M spurlowcodesrc/vm/cointerp.h
    M spurlowcodesrc/vm/gcc3x-cointerp.c
    M spurlowcodestack64src/vm/gcc3x-interp.c
    M spurlowcodestack64src/vm/interp.c
    M spurlowcodestacksrc/vm/gcc3x-interp.c
    M spurlowcodestacksrc/vm/interp.c
    M spursista64src/vm/cogit.h
    M spursista64src/vm/cointerp.c
    M spursista64src/vm/cointerp.h
    M spursista64src/vm/gcc3x-cointerp.c
    M spursistasrc/vm/cogit.h
    M spursistasrc/vm/cointerp.c
    M spursistasrc/vm/cointerp.h
    M spursistasrc/vm/gcc3x-cointerp.c
    M spursrc/vm/cogit.h
    M spursrc/vm/cointerp.c
    M spursrc/vm/cointerp.h
    M spursrc/vm/gcc3x-cointerp.c
    M spurstack64src/vm/gcc3x-interp.c
    M spurstack64src/vm/interp.c
    M spurstacksrc/vm/gcc3x-interp.c
    M spurstacksrc/vm/interp.c
    M src/vm/cogit.h
    M src/vm/cointerp.c
    M src/vm/cointerp.h
    M src/vm/cointerpmt.c
    M src/vm/cointerpmt.h
    M src/vm/gcc3x-cointerp.c
    M src/vm/gcc3x-cointerpmt.c
    M stacksrc/vm/gcc3x-interp.c
    M stacksrc/vm/interp.c

  Log Message:
  -----------
  Merge commit '3bfd04a18ba299b00089c5e8455752f4f65d76e5'


  Commit: 6980f5ec998838e42b0811d478fa3d259cc774d2
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6980f5ec998838e42b0811d478fa3d259cc774d2
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
    M platforms/iOS/vm/OSX/sqSqueakOSXApplication.m
    M platforms/unix/plugins/XDisplayControlPlugin/Makefile.inc
    M platforms/unix/vm/sqUnixHeartbeat.c

  Log Message:
  -----------
  Merge commit '055bae660564200f99228f4e84927c69decb6bb1'


  Commit: 2763a7373bf7a2f1a162ae203b5a6bb5318f2090
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/2763a7373bf7a2f1a162ae203b5a6bb5318f2090
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-23 (Thu, 23 Mar 2017)

  Changed paths:
    M third-party/libssh2.spec

  Log Message:
  -----------
  restore libssh2 version


  Commit: b0c96196928198ade9d281f520ab40122ac79c2a
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b0c96196928198ade9d281f520ab40122ac79c2a
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

  Changed paths:
    M nsspur64src/vm/cogit.h
    M nsspur64src/vm/cogitX64SysV.c
    M nsspur64src/vm/cogitX64WIN64.c
    M nsspur64src/vm/cointerp.c
    M nsspur64src/vm/cointerp.h
    M nsspur64src/vm/gcc3x-cointerp.c
    M nsspursrc/vm/cogit.h
    M nsspursrc/vm/cogitARMv5.c
    M nsspursrc/vm/cogitIA32.c
    M nsspursrc/vm/cogitMIPSEL.c
    M nsspursrc/vm/cointerp.c
    M nsspursrc/vm/cointerp.h
    M nsspursrc/vm/gcc3x-cointerp.c
    M nsspurstack64src/vm/gcc3x-interp.c
    M nsspurstack64src/vm/interp.c
    M nsspurstacksrc/vm/gcc3x-interp.c
    M nsspurstacksrc/vm/interp.c
    M platforms/iOS/vm/Common/Classes/sqMacV2Time.c
    M spur64src/vm/cogit.h
    M spur64src/vm/cogitX64SysV.c
    M spur64src/vm/cogitX64WIN64.c
    M spur64src/vm/cointerp.c
    M spur64src/vm/cointerp.h
    M spur64src/vm/gcc3x-cointerp.c
    M spurlowcode64src/vm/cogit.h
    M spurlowcode64src/vm/cogitX64SysV.c
    M spurlowcode64src/vm/cogitX64WIN64.c
    M spurlowcode64src/vm/cointerp.c
    M spurlowcode64src/vm/cointerp.h
    M spurlowcode64src/vm/gcc3x-cointerp.c
    M spurlowcodesrc/vm/cogit.h
    M spurlowcodesrc/vm/cogitARMv5.c
    M spurlowcodesrc/vm/cogitIA32.c
    M spurlowcodesrc/vm/cogitMIPSEL.c
    M spurlowcodesrc/vm/cointerp.c
    M spurlowcodesrc/vm/cointerp.h
    M spurlowcodesrc/vm/gcc3x-cointerp.c
    M spurlowcodestack64src/vm/gcc3x-interp.c
    M spurlowcodestack64src/vm/interp.c
    M spurlowcodestacksrc/vm/gcc3x-interp.c
    M spurlowcodestacksrc/vm/interp.c
    M spursista64src/vm/cogit.h
    M spursista64src/vm/cogitX64SysV.c
    M spursista64src/vm/cogitX64WIN64.c
    M spursista64src/vm/cointerp.c
    M spursista64src/vm/cointerp.h
    M spursista64src/vm/gcc3x-cointerp.c
    M spursistasrc/vm/cogit.h
    M spursistasrc/vm/cogitARMv5.c
    M spursistasrc/vm/cogitIA32.c
    M spursistasrc/vm/cogitMIPSEL.c
    M spursistasrc/vm/cointerp.c
    M spursistasrc/vm/cointerp.h
    M spursistasrc/vm/gcc3x-cointerp.c
    M spursrc/vm/cogit.h
    M spursrc/vm/cogitARMv5.c
    M spursrc/vm/cogitIA32.c
    M spursrc/vm/cogitMIPSEL.c
    M spursrc/vm/cointerp.c
    M spursrc/vm/cointerp.h
    M spursrc/vm/gcc3x-cointerp.c
    M spurstack64src/vm/gcc3x-interp.c
    M spurstack64src/vm/interp.c
    M spurstacksrc/vm/gcc3x-interp.c
    M spurstacksrc/vm/interp.c
    M src/vm/cogit.h
    M src/vm/cogitARMv5.c
    M src/vm/cogitIA32.c
    M src/vm/cogitMIPSEL.c
    M src/vm/cointerp.c
    M src/vm/cointerp.h
    M src/vm/cointerpmt.c
    M src/vm/cointerpmt.h
    M src/vm/gcc3x-cointerp.c
    M src/vm/gcc3x-cointerpmt.c
    M stacksrc/vm/gcc3x-interp.c
    M stacksrc/vm/interp.c

  Log Message:
  -----------
  Merge commit 'fa67b2b0b225165b427da4217601c457b680363d'


  Commit: 532b0e1802aa72b527e6a28cefd6bee7438bec3e
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/532b0e1802aa72b527e6a28cefd6bee7438bec3e
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

  Changed paths:
    M .travis_test.sh

  Log Message:
  -----------
  Merge commit '5418a415e9297f601f6d57ee732fd7fd942da08c'


  Commit: b042445da78b187ac8dcf7e24516be5caf7a6e30
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b042445da78b187ac8dcf7e24516be5caf7a6e30
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M nsspur64src/vm/cogit.h
    M nsspur64src/vm/cogitX64SysV.c
    M nsspur64src/vm/cogitX64WIN64.c
    M nsspur64src/vm/cointerp.c
    M nsspur64src/vm/cointerp.h
    M nsspur64src/vm/gcc3x-cointerp.c
    M nsspursrc/vm/cogit.h
    M nsspursrc/vm/cogitARMv5.c
    M nsspursrc/vm/cogitIA32.c
    M nsspursrc/vm/cogitMIPSEL.c
    M nsspursrc/vm/cointerp.c
    M nsspursrc/vm/cointerp.h
    M nsspursrc/vm/gcc3x-cointerp.c
    M nsspurstack64src/vm/gcc3x-interp.c
    M nsspurstack64src/vm/interp.c
    M nsspurstacksrc/vm/gcc3x-interp.c
    M nsspurstacksrc/vm/interp.c
    M scripts/gitrevert
    M spur64src/vm/cogit.h
    M spur64src/vm/cogitX64SysV.c
    M spur64src/vm/cogitX64WIN64.c
    M spur64src/vm/cointerp.c
    M spur64src/vm/cointerp.h
    M spur64src/vm/gcc3x-cointerp.c
    M spurlowcode64src/vm/cogit.h
    M spurlowcode64src/vm/cogitX64SysV.c
    M spurlowcode64src/vm/cogitX64WIN64.c
    M spurlowcode64src/vm/cointerp.c
    M spurlowcode64src/vm/cointerp.h
    M spurlowcode64src/vm/gcc3x-cointerp.c
    M spurlowcodesrc/vm/cogit.h
    M spurlowcodesrc/vm/cogitARMv5.c
    M spurlowcodesrc/vm/cogitIA32.c
    M spurlowcodesrc/vm/cogitMIPSEL.c
    M spurlowcodesrc/vm/cointerp.c
    M spurlowcodesrc/vm/cointerp.h
    M spurlowcodesrc/vm/gcc3x-cointerp.c
    M spurlowcodestack64src/vm/gcc3x-interp.c
    M spurlowcodestack64src/vm/interp.c
    M spurlowcodestacksrc/vm/gcc3x-interp.c
    M spurlowcodestacksrc/vm/interp.c
    M spursista64src/vm/cogit.h
    M spursista64src/vm/cogitX64SysV.c
    M spursista64src/vm/cogitX64WIN64.c
    M spursista64src/vm/cointerp.c
    M spursista64src/vm/cointerp.h
    M spursista64src/vm/gcc3x-cointerp.c
    M spursistasrc/vm/cogit.h
    M spursistasrc/vm/cogitARMv5.c
    M spursistasrc/vm/cogitIA32.c
    M spursistasrc/vm/cogitMIPSEL.c
    M spursistasrc/vm/cointerp.c
    M spursistasrc/vm/cointerp.h
    M spursistasrc/vm/gcc3x-cointerp.c
    M spursrc/vm/cogit.h
    M spursrc/vm/cogitARMv5.c
    M spursrc/vm/cogitIA32.c
    M spursrc/vm/cogitMIPSEL.c
    M spursrc/vm/cointerp.c
    M spursrc/vm/cointerp.h
    M spursrc/vm/gcc3x-cointerp.c
    M spurstack64src/vm/gcc3x-interp.c
    M spurstack64src/vm/interp.c
    M spurstacksrc/vm/gcc3x-interp.c
    M spurstacksrc/vm/interp.c
    M src/vm/cogit.h
    M src/vm/cogitARMv5.c
    M src/vm/cogitIA32.c
    M src/vm/cogitMIPSEL.c

  Log Message:
  -----------
  Merge commit 'd8ab3d981f0fd2e95fe0247b4385faa8164b61f1'


  Commit: 5b8c244aa9b8165c7b3ed33581f3bf2d2e523e91
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/5b8c244aa9b8165c7b3ed33581f3bf2d2e523e91
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M build.win32x86/third-party/Makefile.cairo

  Log Message:
  -----------
  force FREETYPE_CONFIG to see if it finds cairo


  Commit: 610c5c22398a25eb24040f6a56e70fd4b31cef16
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/610c5c22398a25eb24040f6a56e70fd4b31cef16
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M third-party/cairo.spec

  Log Message:
  -----------
  update cairo


  Commit: 559b054667e1a7e595b105a9d82a01335b3d3ef3
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/559b054667e1a7e595b105a9d82a01335b3d3ef3
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-01 (Sat, 01 Apr 2017)

  Changed paths:
    M third-party/freetype2.spec

  Log Message:
  -----------
  trying an older freetype version


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

  Changed paths:
    M build.win32x86/third-party/Makefile.cairo

  Log Message:
  -----------
  using Makefile.win32 (too see what happens)


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

  Changed paths:
    M third-party/freetype2.spec

  Log Message:
  -----------
  back to newer version


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

  Changed paths:
    M build.win32x86/third-party/Makefile.cairo

  Log Message:
  -----------
  force freetype_libs


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

  Changed paths:
    M build.win32x86/third-party/Makefile.cairo

  Log Message:
  -----------
  force freetype flags


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

  Changed paths:
    M .appveyor.yml
    M .travis.yml
    A deploy/pharo/deploy-files.pharo.org-appveyor.sh
    A deploy/pharo/deploy-files.pharo.org.sh
    A deploy/pharo/deploy-key.sh
    A deploy/pharo/deploy_key.enc
    A deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  try to deploy on osvm


  Commit: 252c5bc5af3ccf7231c2bb6ab3cf4ea137dd088e
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/252c5bc5af3ccf7231c2bb6ab3cf4ea137dd088e
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    A deploy.pharo/deploy-files.pharo.org-appveyor.sh
    A deploy.pharo/deploy-files.pharo.org.sh
    A deploy.pharo/deploy-key.sh
    A deploy.pharo/deploy_key.enc
    A deploy.pharo/pack-vm.sh
    R deploy/pharo/deploy-files.pharo.org-appveyor.sh
    R deploy/pharo/deploy-files.pharo.org.sh
    R deploy/pharo/deploy-key.sh
    R deploy/pharo/deploy_key.enc
    R deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  using “deploy.pharo” as more aligned with the build.* convention


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

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  fix before_deploy scripts


  Commit: 55772eb80c9777bfa336c0e29bf983299bdc0cf5
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/55772eb80c9777bfa336c0e29bf983299bdc0cf5
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  fix typo


  Commit: 06c610e109f22cf8e2e3e62d695a34a6c718ba3d
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/06c610e109f22cf8e2e3e62d695a34a6c718ba3d
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M deploy.pharo/pack-vm.sh

  Log Message:
  -----------
  forget to rename bash function


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

  Changed paths:
    M deploy.pharo/pack-vm.sh

  Log Message:
  -----------
  fixed position for packed vm


  Commit: 77b4e160557f9003f009e7ae87597276bc909df9
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/77b4e160557f9003f009e7ae87597276bc909df9
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    R deploy.pharo/deploy-files.pharo.org-appveyor.sh
    R deploy.pharo/deploy-files.pharo.org.sh
    R deploy.pharo/deploy-key.sh
    R deploy.pharo/deploy_key.enc
    R deploy.pharo/pack-vm.sh
    A deploy/pharo/deploy-files.pharo.org-appveyor.sh
    A deploy/pharo/deploy-files.pharo.org.sh
    A deploy/pharo/deploy-key.sh
    A deploy/pharo/deploy_key.enc
    A deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  restore deplot/pharo structure
add some debug info


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

  Changed paths:
    M .travis.yml
    M deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  fix deploy/pharo dir


  Commit: 6f97725217c12fb25b0279df43bbc3b2c47a08ff
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6f97725217c12fb25b0279df43bbc3b2c47a08ff
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .travis.yml
    M deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  split itimer and threaded heartbeat


  Commit: 63b12980b96e925622e8199bb6a002f80f26e91a
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/63b12980b96e925622e8199bb6a002f80f26e91a
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  temporal disable osvm deploy


  Commit: 7578260c1e4aab21bba42eb1ddc5dd50d826fed3
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7578260c1e4aab21bba42eb1ddc5dd50d826fed3
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .travis.yml
    M deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  fix lookup of linux vm directory


  Commit: 91ea63c192193785c6a87da12d42c8dd16d8b188
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/91ea63c192193785c6a87da12d42c8dd16d8b188
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .travis.yml
    M deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  fix armv6
test all pharo.cog.spur


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

  Changed paths:
    M .appveyor.yml
    M deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  try appveyor


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

  Changed paths:
    M .appveyor.yml

  Log Message:
  -----------
  temporal remove of non-pharo flavors (for testing)


  Commit: 22ccdbea29c3766121d6f8fa0d15437a99247cd6
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/22ccdbea29c3766121d6f8fa0d15437a99247cd6
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .appveyor.yml
    R deploy/pharo/deploy-files.pharo.org-appveyor.sh
    A deploy/pharo/filter-exec.sh

  Log Message:
  -----------
  filtering appveyor deploy for pharo


  Commit: 6212b653af643b3579d17f6651d36e2e0c65ba6f
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/6212b653af643b3579d17f6651d36e2e0c65ba6f
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .appveyor.yml
    M deploy/pharo/pack-vm.sh

  Log Message:
  -----------
  clean debug remainings
allow a build to finish, so he can build the cache


  Commit: 0721ab7cf014cc2bd69193e93366816d7e9366ac
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/0721ab7cf014cc2bd69193e93366816d7e9366ac
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M .appveyor.yml

  Log Message:
  -----------
  now yes, try the deploy on windows


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

  Changed paths:
    M .appveyor.yml
    M .travis.yml
    M deploy/pharo/filter-exec.sh

  Log Message:
  -----------
  cleaning, restoring, pointing to correct place


  Commit: 68c5baa135b06986f7a22e00178d493faf576529
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/68c5baa135b06986f7a22e00178d493faf576529
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Log Message:
  -----------
  Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into Cog


  Commit: 1734b605470651cc51c7a04c2c61007bad7d5beb
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1734b605470651cc51c7a04c2c61007bad7d5beb
  Author: Esteban Lorenzano <[hidden email]>
  Date:   2017-04-08 (Sat, 08 Apr 2017)

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

  Log Message:
  -----------
  Merge pull request #130 from estebanlm/Cog

pharo to deploy from opensmalltalk-vm


Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/3aa11ab38645...1734b6054706
Loading...