Merge commit 'refs/merge-requests/2' of git://gitorious.org/ags/ags into merge-requests/2
authorBernhard Rosenkraenzer <bero@arklinux.org>
Sun, 22 May 2011 15:44:29 +0000 (17:43 +0159)
committerBernhard Rosenkraenzer <bero@arklinux.org>
Sun, 22 May 2011 15:44:29 +0000 (17:43 +0159)
commitd87960092fbf8c1595d81bbcf8c7006bd8caf43a
treefd7795c771f5adb248ed76ba55ed96db2624a60b
parentb3114dac0acd9fc98935aba62bf964b78d850f1a
parent4825612ed428eb6d202c358493531e361d18ab4f
Merge commit 'refs/merge-requests/2' of git://gitorious.org/ags/ags into merge-requests/2

Conflicts:
Engine/ac.cpp
Engine/CMakeLists.txt
Engine/ac.cpp