15 commits

Author	SHA1	Message	Date
mattraykowski	69d1538521	merging gui editor repo.	2013-02-14 09:53:06 -06:00
mattraykowski	90f26c3378	removed line from a bad merge of the character achievement code, sorry	2013-02-14 07:47:40 -06:00
mattraykowski	601c6453a9	Added another path for x86_64 Ubuntu 12.10 for libwww	2013-02-14 07:46:42 -06:00
dfighter1985	0bec72db39	another merge from mainline	2013-02-14 13:56:05 +01:00
dfighter1985	f5dd945811	Merged mainline default branch changes.	2013-02-14 10:47:10 +01:00
kervala	2b09afc828	Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!)	2013-02-13 14:40:41 +01:00
kervala	28b160bcb8	Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!)	2013-02-12 22:48:37 +01:00
mattraykowski	b826584354	merging	2013-02-12 10:28:20 -06:00
mattraykowski	87cf42f0fe	merging character achievements branch into default.	2013-02-12 10:24:53 -06:00
kervala	1e724738ba	Changed: French comments translated to English	2013-02-11 22:24:48 +01:00
kervala	95144d5903	Changed: Typo fixes (thanks to Vagrant!)	2013-02-09 10:05:32 +01:00
kervala	0a5a5123df	Changed: Typo fixes (thanks to Vagrant!)	2013-02-08 13:17:44 +01:00
kervala	67cdeb022b	Changed: Use OpenGL by default with an ATI card and without a warning dialog	2013-02-01 21:58:05 +01:00
dfighter1985	cde1a42750	MODIFIED: #1471 Merged mainline default to this branch.	2012-11-25 05:22:40 +01:00
dfighter1985	676720f294	CHANGED: #1471 The local string mapper is now instantiated by CWidgetManager.	2012-07-16 06:16:43 +02:00