Merge branch 'master' of https://github.com/wmvanvliet/Chimara
authorMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sat, 29 Jan 2011 16:04:08 +0000 (17:04 +0100)
committerMarijn van Vliet <w.m.vanvliet@student.utwente.nl>
Sat, 29 Jan 2011 16:04:08 +0000 (17:04 +0100)
commitf945dd447b55c34d88683ff48d7ffb0b7c3c2ad8
tree4ccc378066efc97b4b3a1df9ac4e46fae67e2bc4
parentb4edce061b3ad51cd2c2be1ae996c724481ef4e0
parent393b7a2b777d06754da16ffa5998d3eb9bf128ad
Merge branch 'master' of https://github.com/wmvanvliet/Chimara

Conflicts:
libchimara/garglk.c
libchimara/garglk.c
player/chimara.menus
player/main.c
player/style.css
tests/plugin-loader.c
tests/style.css