Correl Roush 6d227f0cf9 Merge branch 'pr/14' ... Conflicts: resources/language/Russian/strings.xml resources/lib/gui.py		2013-04-11 22:56:24 -04:00
..
720p	Merge branch 'pr/14'	2013-04-11 22:56:24 -04:00
media	Add a settings button to the main window	2013-03-15 11:15:14 +03:00
skin.xml	Fixing things up	2010-07-12 20:01:01 -04:00