Merge commit 'refs/merge-requests/4' of git://gitorious.org/ags/ags into merge-requests/4
authorBernhard Rosenkraenzer <bero@arklinux.org>
Sun, 22 May 2011 15:12:36 +0000 (17:11 +0159)
committerBernhard Rosenkraenzer <bero@arklinux.org>
Sun, 22 May 2011 15:12:36 +0000 (17:11 +0159)
commitb3114dac0acd9fc98935aba62bf964b78d850f1a
treeabad46129ed59858002316e07f3fe6bcfa54d755
parent12b45ffc482228fffc447ddca86ac2ce9c7b9467
parentc565cbfef59749924799b2056cbd47220683c2af
Merge commit 'refs/merge-requests/4' of git://gitorious.org/ags/ags into merge-requests/4

(Resolved) conflicts:
Common/acsound.h
Common/libinclude/almp3.h
Common/libinclude/almp3dll.h
Engine/ac.cpp
Engine/acsound.cpp
Engine/almp3.c
Common/acsound.h
Engine/ac.cpp
Engine/acsound.cpp