Merge branch 'jfc-darcs-cffi' into jfc-new-cffi-foreign-types
commit9b7dfac30e319ac7aff887fcc58119d06ef5f793
authorJohn Connors <johnc@yagc.ndo.co.uk>
Sat, 29 Mar 2008 17:13:49 +0000 (29 17:13 +0000)
committerJohn Connors <johnc@yagc.ndo.co.uk>
Sat, 29 Mar 2008 17:13:49 +0000 (29 17:13 +0000)
tree6870d136204471c2c88c708e2d4b9d27b46f2517
parenta92e9454bb986e2ab77fb808a53112b1c1594943
parente2e7defaabaa93d240678fee2da35d6887ea20f2
Merge branch 'jfc-darcs-cffi' into jfc-new-cffi-foreign-types

Conflicts:

lib/types.lisp
lib/glfw.lisp