Merge branch 'master' into browser
authorPhilip Chimento <philip.chimento@gmail.com>
Sat, 16 Jul 2011 21:58:50 +0000 (23:58 +0200)
committerPhilip Chimento <philip.chimento@gmail.com>
Sat, 16 Jul 2011 21:58:50 +0000 (23:58 +0200)
1  2 
configure.ac
libchimara/chimara-glk.c
libchimara/chimara-if.c
player/Makefile.am

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge