]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 13 Jan 2009 23:54:27 +0000 (17:54 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 13 Jan 2009 23:54:27 +0000 (17:54 -0600)
commit21433c47ef85b0f2d3d70b80fd004cc3340cb9f6
tree5fc9174910198ae31dad8d683ae2167cd13557da
parenta31b59748d2e5ba55ec55e4cf27d787b4e03371e
parentd06996a6aa5858b8b4427cb457aee3292c86b453
Fix conflict
basis/io/styles/styles-docs.factor
basis/io/styles/styles.factor
basis/ui/gadgets/panes/panes.factor