]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorBruno Deferrari <utizoc@gmail.com>
Mon, 15 Sep 2008 18:28:16 +0000 (15:28 -0300)
committerBruno Deferrari <utizoc@gmail.com>
Mon, 15 Sep 2008 18:28:16 +0000 (15:28 -0300)
commit4bd73a1eb7a96e6f54f091e9cf4e217de004308b
tree29c6aea74efd890768ef0882801e7e1dc6267db8
parentc3380865c107824ac6a7081b9de46f124ecdb71a
parente39d8ab92c394eddf865a3717f67dab0781d3506
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

extra/irc/messages/messages.factor
extra/irc/client/client.factor
extra/irc/messages/messages.factor