David Capello c0078809f7 Merge branch '1.0'
Conflicts:
	data/gui.xml
	src/config.h
	src/main/resources_win32.rc
2014-11-16 13:26:02 -03:00
..
2014-08-18 23:51:57 -03:00
2014-08-29 13:14:13 -04:00
2014-11-16 13:26:02 -03:00