Merge pull request #124 from lakkatv/master

Add imx6 platform to the Makefile
Bake in Conker's Bad Fur Day ini settings

Fixes missing game saves
Merge pull request #125 from heuripedes/master

Bake in Conker's Bad Fur Day ini settings
Update rom.c
Added script to generate rom_luts.c from mupen64plus.ini
Use lookup tables instead of huge conditions in rom.c
Merge pull request #126 from heuripedes/master

Use lookup tables instead of huge conditionals in rom.c
Add Killer Instinct entries to lut_cpop too
Refactor DelaySI entries
Add notaz's gles2rice neon optimizations
Merge pull request #129 from zephyr1988/master

Add notaz's gles2rice neon optimizations
Typo in Makefile
Merge pull request #130 from zephyr1988/master

Typo in Makefile
Add NEON ifdef around neon code to fix compilation on other architectures
Merge pull request #131 from zephyr1988/master

Add NEON ifdef around neon code to fix compilation on other architecture...
Simplify osal_preproc.h
(Rice) Simplify osal_preproc.h
(Rice) Build fixes - get rid of BOOL
(Rice) Rename RECT struct
(Rice) Update CSortedList.h for BB QNX build ifx