Commit [458af0] devel History

Merge branch 'master' into devel

Conflicts:
configure.ac

waker waker 2012-10-25

changed plugins/notify/notify.c
changed plugins/sndfile/sndfile.c
changed ChangeLog
changed PORTABLE_VERSION
plugins/notify/notify.c Diff Switch to side-by-side view
Loading...
plugins/sndfile/sndfile.c Diff Switch to side-by-side view
Loading...
ChangeLog Diff Switch to side-by-side view
Loading...
PORTABLE_VERSION Diff Switch to side-by-side view
Loading...