Merge branch 'master' of git://factorcode.org/git/factor

diff --cc core/threads/threads.factor
Simple merge

diff --cc extra/opengl/gl/extensions/extensions.factor
index f6943c1ec606709e766c53f7ce6474be6fc92509,20929fb41039b44b407ff4f8f009a2d0e8df1b89..739ad203a19825f39c951d14c4a447e67f7e0300
--- 1/extra/opengl/gl/extensions/extensions.factor
--- 2/extra/opengl/gl/extensions/extensions.factor
+++ b/extra/opengl/gl/extensions/extensions.factor
@@@ -7,9 -8,8 +8,8 @@@ ERROR: unknown-gl-platform 
      { [ os windows? ] [ "opengl.gl.windows" ] }
      { [ os macosx? ]  [ "opengl.gl.macosx" ] }
      { [ os unix? ] [ "opengl.gl.unix" ] }
 -    { [ t ] [ unknown-gl-platform ] }
 +    [ unknown-gl-platform ]
  } cond use+ >>
- IN: opengl.gl.extensions
  
  SYMBOL: +gl-function-number-counter+
  SYMBOL: +gl-function-pointers+

diff --cc extra/tools/vocabs/vocabs.factor
Simple merge

diff --cc extra/tools/walker/walker.factor
index 4f8da77ddf007caf8071a8e27f7c26fa92c17df7,42c8f93e4cac028bff751ec0b5a29ed2cc343033..8a5ab42767d3df122eeed021c52992fa4920821e
--- 1/extra/tools/walker/walker.factor
--- 2/extra/tools/walker/walker.factor
+++ b/extra/tools/walker/walker.factor
@@@ -72,8 -72,9 +72,9 @@@ M: object add-breakpoint 
      {
          { [ dup "step-into" word-prop ] [ "step-into" word-prop call ] }
          { [ dup standard-generic? ] [ effective-method (step-into-execute) ] }
+         { [ dup hook-generic? ] [ effective-method (step-into-execute) ] }
          { [ dup primitive? ] [ execute break ] }
 -        { [ t ] [ word-def (step-into-quot) ] }
 +        [ word-def (step-into-quot) ]
      } cond ;
  
  \ (step-into-execute) t "step-into?" set-word-prop

diff --cc extra/ui/tools/interactor/interactor.factor
Simple merge

diff --cc extra/ui/windows/windows.factor
Simple merge