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)
commit6fd0347f330cb24ef6145662023053a1c0f81a64
treed440898fcabf6687042a109f26cb758a19517782
parent7d14a66ee234db0898de6fabb8f850ebc4bb733a
parent4a0178d00f3ab8741f5ef10a44a63d49e19d0cd3
Merge branch 'master' into browser
configure.ac
libchimara/chimara-glk.c
libchimara/chimara-if.c
player/Makefile.am