Fix conflict

diff --cc basis/alien/c-types/c-types.factor
Simple merge

diff --cc basis/alien/structs/structs.factor
index 181ff98e627f1b003e5800852a36eb20e8d36407,adb25aa977a33fffcbe8cb330a13d5f8e67175e3..a97fcf9964ac80ce49dd970a8f61f4a9afeff9d7
--- 1/basis/alien/structs/structs.factor
--- 2/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@@ -34,13 -36,13 +36,13 @@@ M: struct-type stack-siz
  
  : c-struct? ( type -- ? ) (c-type) struct-type? ;
  
 -: (define-struct) ( name vocab size align fields -- )
 +: (define-struct) ( name size align fields -- )
      >r [ align ] keep r>
      struct-type boa
 -    -rot define-c-type ;
 +    swap typedef ;
  
  : define-struct-early ( name vocab fields -- fields )
-     -rot [ rot first2 <field-spec> ] 2curry map ;
+     [ first2 <field-spec> ] with with map ;
  
  : compute-struct-align ( types -- n )
      [ c-type-align ] map supremum ;

diff --cc basis/compiler/tests/alien.factor
Simple merge

diff --cc basis/locals/locals.factor
Simple merge

diff --cc basis/opengl/opengl.factor
index 300e4f0a716aa552022410f93ae80becf7341eff,ecb4c4a08ccaef179c298ec184189a0a2e31d91d..5497229b6c9937624c2f7173ec9f789f6f02eeb7
--- 1/basis/opengl/opengl.factor
--- 2/basis/opengl/opengl.factor
+++ b/basis/opengl/opengl.factor
@@@ -65,18 -64,19 +65,19 @@@ MACRO: all-enabled-client-state ( seq q
      [ 2 GL_FLOAT 0 ] dip glTexCoordPointer ; inline
  
  : line-vertices ( a b -- )
-     append >float-array underlying>> gl-vertex-pointer ;
+     [ first2 [ 0.5 + ] bi@ ] bi@ 4 narray
 -    >c-float-array gl-vertex-pointer ;
++    >float-array underlying>> gl-vertex-pointer ;
  
  : gl-line ( a b -- )
      line-vertices GL_LINES 0 2 glDrawArrays ;
  
  : (rect-vertices) ( dim -- vertices )
      {
-         [ drop 0 1 ]
-         [ first 1- 1 ]
-         [ [ first 1- ] [ second ] bi ]
-         [ second 0 swap ]
+         [ drop 0.5 0.5 ]
+         [ first 0.3 - 0.5 ]
+         [ [ first 0.3 - ] [ second 0.3 - ] bi ]
+         [ second 0.3 - 0.5 swap ]
 -    } cleave 8 narray >c-float-array ;
 +    } cleave 8 float-array{ } nsequence underlying>> ;
  
  : rect-vertices ( dim -- )
      (rect-vertices) gl-vertex-pointer ;

diff --cc basis/ui/gadgets/buttons/buttons.factor
index c2fe483d35f00d5f3a8d3984bb067e5d32787f47,d74284cbd6bb2c3eba523f6f3200d7e69c004e9a..ffc0aa63c40a838186808738d38aba71ef023952
--- 1/basis/ui/gadgets/buttons/buttons.factor
--- 2/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@@ -5,9 -5,7 +5,8 @@@ strings quotations assocs combinators c
  classes.tuple opengl opengl.gl math.vectors ui.commands ui.gadgets
  ui.gadgets.borders ui.gadgets.labels ui.gadgets.theme
  ui.gadgets.tracks ui.gadgets.packs ui.gadgets.worlds ui.gestures
 -ui.render math.geometry.rect locals alien.c-types ;
 +ui.render math.geometry.rect locals alien.c-types
 +specialized-arrays.float ;
- 
  IN: ui.gadgets.buttons
  
  TUPLE: button < border pressed? selected? quot ;

diff --cc basis/ui/render/render.factor
index 9529e34c708b166b5b086868f861cef46edb66dd,1e4c9c34f1c0b2f7fe1e60ef98abff27519c552b..94efd1bf221b3483b1ab86172227599b73a735bd
mode 100644,100755..100755
--- 1/basis/ui/render/render.factor
--- 2/basis/ui/render/render.factor
+++ b/basis/ui/render/render.factor