diff --git a/README.md b/README.md index 71f324c..250eb32 100644 --- a/README.md +++ b/README.md @@ -55,10 +55,12 @@ This is a gentle step-by-step guide through the abstract and complex universe of * Environmental-maps (spherical and cube) * Reflect and refract -* [Examples](examples/) +## More * [Glossary](glossary/) +* [Examples Gallery](examples/) + * [Appendix:](appendix/) Other ways to use this book * [How can I navigate this book offline?](appendix/) * [How to run the examples on a RaspberryPi?](appendix/) @@ -81,3 +83,5 @@ Thanks [Scott Murray](http://alignedleft.com/) for the inspiration and advice. Thanks [Karim Naaji](http://karim.naaji.fr/) for contributing with support, good ideas and code. Thanks to everyone who has believed in this project and contributed with fixes or donations. + +

powered by TinyLetter

diff --git a/appendix/README.md b/appendix/README.md index 8bfd2ec..2f097ef 100644 --- a/appendix/README.md +++ b/appendix/README.md @@ -48,12 +48,7 @@ To install and set this all up on the RaspberryPi after installing the OS and lo ```bash sudo apt-get update sudo apt-get upgrade -<<<<<<< HEAD -sudo apt-get install git-core -sudo apt-get install libfreeimage-dev -======= sudo apt-get install git-core ->>>>>>> master cd ~ git clone http://github.com/patriciogonzalezvivo/glslViewer.git cd glslViewer @@ -78,10 +73,6 @@ In **MacOSX** get sure to have [homebrew](http://brew.sh/) installed and then on ```bash brew update brew upgrade -<<<<<<< HEAD -brew install git freeimage -======= ->>>>>>> master brew tap homebrew/versions brew install glfw3 cd ~ @@ -96,11 +87,7 @@ On **RaspberryPi** you need to do: ```bash sudo apt-get update sudo apt-get upgrade -<<<<<<< HEAD -sudo apt-get install git-core libfreeimage -======= sudo apt-get install git-core ->>>>>>> master cd ~ git clone http://github.com/patriciogonzalezvivo/glslViewer.git cd glslViewer