[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.6.1-1-5-g0446588

[Stephen Kitt]

The following commit has been merged in the master branch:
commit aef0cfebbdee4a8188c0ebbc27a110b4adaa12ca
Merge: ffdf51e384fafa87d92df3d991aaebd53d60a990 3cbab3edc5c9f9e73050531d48584b431eebee39
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Jun 1 20:47:55 2012 +0200

    Merge tag 'upstream/3.7'
    
    Upstream version 3.7
    
    Conflicts:
    	debian/changelog


-- 
Atari 2600 Emulator for SDL & the X Window System