From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 16 Oct 2008 04:56:42 +0000 (-0500)
Subject: Merge branch 'master' of git://repo.or.cz/factor/jcg
X-Git-Tag: 0.94~2320^2~69
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=171c235c961a1f148142b4500f6c31e704640a2d

Merge branch 'master' of git://repo.or.cz/factor/jcg

Conflicts:

	basis/cocoa/messages/messages.factor
---

171c235c961a1f148142b4500f6c31e704640a2d
diff --cc basis/cocoa/messages/messages.factor
index 09601ef8cc,3d7e1bfd84..3d7e1bfd84
mode 100644,100755..100644
--- a/basis/cocoa/messages/messages.factor
+++ b/basis/cocoa/messages/messages.factor
diff --cc basis/cocoa/subclassing/subclassing.factor
index 3f8e709df0,fd18c7fa89..fd18c7fa89
mode 100644,100755..100644
--- a/basis/cocoa/subclassing/subclassing.factor
+++ b/basis/cocoa/subclassing/subclassing.factor
diff --cc basis/ui/cocoa/views/views.factor
index 45ab8ac0ce,c6942a8158..c6942a8158
mode 100644,100755..100644
--- a/basis/ui/cocoa/views/views.factor
+++ b/basis/ui/cocoa/views/views.factor