The following commit has been merged in the master branch: commit 11550976dd9fe02f621ec91485251c95cce4e366 Merge: 124e4d42e0a2eb1dbf577d1fd23817e424486038 48a120f883b7a215c27bf8acf7989dc7068b93da Author: Stephen Kitt <st...@sk2.org> Date: Sat Feb 4 23:33:19 2012 +0100
Merge commit 'upstream/3.5.5' Conflicts: debian/changelog -- Atari 2600 Emulator for SDL & the X Window System _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits