6 Commits

Author SHA1 Message Date
Maksim Gamarnik
8f6ddcc57c Merge branch 'upstream/master' 2016-03-14 11:44:17 +02:00
Jean-Patrick Guerrero
08b9a710be Update settings tab + some misc. clean-up 2016-03-05 10:41:51 +01:00
Maksim Gamarnik
7f8e94c093 Merge remote-tracking branch 'upstream/master' 2016-02-27 21:08:56 +02:00
est31
246fafdfc1 Don't generate trailing spaces in minetest.conf.example
If the default value of a setting was empty,
it previously generated a trailing space.
2016-02-27 05:49:22 +01:00
Maksim Gamarnik
40b3667bd2 Merge remote-tracking branch 'upstream/master' 2016-02-23 00:38:30 +02:00
BlockMen
5e0a7cd4eb Restore simple settings tab and add advanced settings as dialog 2016-02-21 08:54:33 +00:00