Uriziel 5dc1288fd4 Merge remote-tracking branch 'origin/controlledRooms-new'
Conflicts:
	syncplay/client.py
	syncplay/constants.py
	syncplay/players/mplayer.py
	syncplay/ui/gui.py
2014-11-29 18:51:27 +01:00
..
2012-10-17 18:24:13 +02:00
2013-05-04 20:40:34 +02:00
2013-06-01 18:58:39 +01:00
2013-06-04 09:24:51 +01:00
2013-06-04 09:24:51 +01:00
2014-07-11 20:44:01 +01:00
2013-06-04 09:42:32 +01:00
2013-06-04 09:24:51 +01:00
2014-07-11 20:44:01 +01:00
2013-06-01 18:58:39 +01:00
2013-06-01 18:58:39 +01:00
2014-07-11 20:44:01 +01:00
2012-10-12 19:06:55 +02:00
2014-09-07 11:07:18 +02:00
2013-01-05 23:37:13 +01:00
2014-10-25 10:23:31 +01:00
2013-10-15 01:08:09 +01:00
2013-10-15 01:08:09 +01:00
2013-10-15 01:08:09 +01:00
2013-06-01 18:58:39 +01:00
2013-06-04 09:24:51 +01:00
2014-10-04 00:43:48 +01:00
2014-10-24 23:45:08 +01:00
2013-10-15 01:08:09 +01:00