~libretro/libretro/+git/Craft:terrain

Last commit made on 2014-02-10
Get this branch:
git clone -b terrain https://git.launchpad.net/~libretro/libretro/+git/Craft

Branch merges

Branch information

Name:
terrain
Repository:
lp:~libretro/libretro/+git/Craft

Recent commits

e6e93f8... by Michael Fogleman <email address hidden>

terrain branch tweaks

cde653c... by Michael Fogleman <email address hidden>

Merge branch 'terrain' of https://github.com/fogleman/Craft into terrain

0e73293... by Michael Fogleman <email address hidden>

cmake update for terrain

ec6ae46... by Michael Fogleman <email address hidden>

Merge branch 'master' into terrain

Conflicts:
 Makefile
 Makefile.osx

889c41a... by Michael Fogleman <email address hidden>

updated .gitignore

1958e20... by Michael Fogleman <email address hidden>

Update README.md

a775bec... by Michael Fogleman <email address hidden>

removed old makefile

427c57a... by Michael Fogleman <email address hidden>

updated to build with cmake

374bf4e... by Michael Fogleman <email address hidden>

per-vertex normals

bc41379... by Michael Fogleman <email address hidden>

Merge branch 'master' into terrain

Conflicts:
 Makefile.osx
 db.h
 main.c
 texture.png