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

Conflicts:

	extra/windows/ole32/ole32.factor

diff --cc extra/windows/ole32/ole32.factor
index 3be442514c82927d529942e1502f39e6a59eb79b,6e06830130151574a21abd830e25e97e68d0f553..ae3dafbc9f6b5b879489d587784ccec1ff05372d
--- 1/extra/windows/ole32/ole32.factor
--- 2/extra/windows/ole32/ole32.factor
+++ b/extra/windows/ole32/ole32.factor
@@@ -4,10 -4,16 +4,10 @@@ IN: windows.ole3
  \r
  LIBRARY: ole32\r
  \r
 -C-STRUCT: GUID\r
 -    { "DWORD" "part1" }\r
 -    { "DWORD" "part2" }\r
 -    { "DWORD" "part3" }\r
 -    { "DWORD" "part4" } ;\r
 -\r
 -TYPEDEF: void* REFGUID\r
 +TYPEDEF: GUID* REFGUID\r
  TYPEDEF: void* LPUNKNOWN\r
- TYPEDEF: ushort* LPOLESTR\r
- TYPEDEF: ushort* LPCOLESTR\r
+ TYPEDEF: wchar_t* LPOLESTR\r
+ TYPEDEF: wchar_t* LPCOLESTR\r
  \r
  TYPEDEF: REFGUID REFIID\r
  TYPEDEF: REFGUID REFCLSID\r

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