Merge changes with uau20091126
commitd9e0e9035a45e2ab4d6842f110c1b8c523e96d5c
authorKovenksy <diogomfranco@gmail.com>
Thu, 26 Nov 2009 17:06:49 +0000 (26 17:06 +0000)
committerKovenksy <diogomfranco@gmail.com>
Thu, 26 Nov 2009 17:06:49 +0000 (26 17:06 +0000)
tree863aa02d9619c561b279f82037c9a8e8c7357441
parent5b76d6ef2557d4a1f94e75867b5e738bc807b973
parent1dba61a67063fac2c6f02dc31ab84e61ff279617
Merge changes with uau

Also changed the style of the version header
to match uau's version script.

Conflicts:
version.sh
Makefile
configure
mplayer.c
version.sh