]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@factorcode.org>
Sat, 2 Feb 2008 19:36:26 +0000 (13:36 -0600)
committerSlava Pestov <slava@factorcode.org>
Sat, 2 Feb 2008 19:36:26 +0000 (13:36 -0600)
commit36a43a6c3f2aebadcc0a334b4a0127b11f2d0e8e
tree7482e85a804a99b9934f95d0da1ac66211dde7d6
parent8575bc62e3e8c1575e000b44aa07f1fe7ed45f45
parenta05c18152b59073c49aa313ba685516310ec74a8
Fix conflict
extra/windows/advapi32/advapi32.factor
extra/x/widgets/wm/frame/frame.factor
extra/x11/windows/windows.factor
extra/x11/xlib/xlib.factor