]> gitweb.factorcode.org Git - factor.git/history - basis/opengl/shaders/shaders.factor
Conflict resolution
[factor.git] / basis / opengl / shaders / shaders.factor
2008-12-18 Jose A. Ortega RuizConflict resolution
2008-12-18 Doug ColemanMerge branch 'master' of git://factorcode.org/git/factor
2008-12-18 Slava PestovRemove >r/r>
2008-12-14 John BenediktssonMerge branch 'master' of git://factorcode.org/git/factor
2008-12-13 Jose A. Ortega RuizMerge commit 'origin/master' into emacs
2008-12-13 Doug ColemanMerge branch 'master' of git://factorcode.org/git/factor
2008-12-13 Slava PestovRemove .lib dependencies from opengl.{shaders,framebuff...
2008-09-06 Daniel EhrenbergMerge branch 'master' of git://factorcode.org/git/factor
2008-09-06 Bruno DeferrariMerge branch 'master' of git://factorcode.org/git/factor
2008-09-06 Slava PestovMove match to basis since compiler.tree.debugger uses...
2008-09-06 Slava PestovFixing basis -> extra dependencies
2008-08-31 Slava PestovMerge branch 'master' of git://repo.or.cz/factor/jcg
2008-08-29 Bruno DeferrariMerge branch 'master' of git://factorcode.org/git/factor
2008-08-27 Doug ColemanMerge branch 'master' of git://factorcode.org/git/factor
2008-08-27 Eduardo CavazosMerge branch 'master' of git://factorcode.org/git/factor
2008-08-27 Slava PestovFix conflict
2008-08-27 Slava PestovMerge branch 'master' of git://factorcode.org/git/jamesnvc
2008-08-27 Slava PestovMerge branch 'master' of git://factorcode.org/git/factor
2008-08-27 Slava PestovMerge branch 'master' of git://factorcode.org/git/factor
2008-08-23 Slava PestovMove a few UI dependencies into basis