Slava Pestov e8a69a3aea Fix conflict		2008-11-29 05:14:49 -06:00
..
capabilities	Updating code for make and fry changes	2008-09-10 22:11:40 -05:00
demo-support	Updating various apps in extra for GL words being moved around	2008-11-11 03:10:41 -06:00
framebuffers	Fixing basis -> extra dependencies	2008-09-05 19:29:14 -05:00
gadgets	Merge branch 'master' of git://repo.or.cz/factor/jcg	2008-11-19 13:02:55 -06:00
shaders	Fix conflict	2008-11-18 22:18:14 -06:00