search

cnlohr / noeuclid

Non-euclidean GPU Raytraced Game
BSD 3-Clause "New" or "Revised" License
644 stars 48 forks source link

Sfml #30

Closed cnlohr closed 9 years ago

cnlohr commented 9 years ago

I'm still a novice here. I'm trying to figure out how to merge everything back to master.

phiresky commented 9 years ago

Oh god this won't go well. With the merged and reverted other pull request this will probably do weird stuff.

phiresky commented 9 years ago

nope, that didn't work

cnlohr commented 9 years ago

GAAAAHHH It's on fire!

cnlohr commented 9 years ago

Only thing I can think to do now is try to overwrite the other changes in main with the SFML branch?