29 commits

Author	SHA1	Message	Date
kervala	6fbf8c5326	Merge with develop	2016-05-26 19:36:25 +02:00
kervala	cf5bd0e82d	Changed: Renamed ring_map_entry_ponts.txt to r2_entry_points.txt in compatibility-develop too (don't forget to update data_common.bnp!)	2016-05-20 19:18:46 +02:00
kervala	9340cb4449	Merge with develop	2016-05-18 09:57:33 +02:00
kervala	5bbd69cbe0	Merge with develop	2016-05-12 19:57:37 +02:00
kervala	7bcf3bfe5c	Merge with develop	2016-05-08 19:24:04 +02:00
kervala	bf79b16b5b	Merge with develop	2016-05-08 13:42:53 +02:00
kervala	0bcf110925	Changed: Version 3.0.0	2016-04-09 12:53:30 +02:00
kervala	208e02b31e	Merge with develop	2016-04-06 09:34:34 +02:00
kervala	dba1ff2ec4	Merge with develop	2016-03-29 14:00:04 +02:00
kervala	2c35c82d9d	Merge with develop	2016-03-20 17:09:13 +01:00
kervala	371cba9a84	Merge with develop	2016-03-18 22:27:43 +01:00
kaetemi	4eb9d884d0	Merge with develop	2016-03-10 12:09:18 +01:00
kervala	75199aad21	Merge with develop	2016-02-23 17:05:57 +01:00
kervala	9006c8e8c2	Merge with develop	2016-02-21 17:06:38 +01:00
kervala	b81cee92c8	Merge with develop	2016-02-21 13:57:35 +01:00
kervala	9ad79cc4b6	Changed: Updated world_editor_classes.xml	2016-02-21 13:52:20 +01:00
kervala	c4b768833b	Merge with develop	2016-02-21 13:22:22 +01:00
kervala	0350c97f0a	Merge with develop	2016-02-20 19:29:00 +01:00
kervala	ab14a96bd5	Merge with develop	2016-01-30 16:23:28 +01:00
kervala	ee30d06fa3	Merge	2016-01-26 22:45:40 +01:00
kervala	1dd308474c	Merge with develop	2016-01-26 22:44:40 +01:00
kervala	198759a880	Fixed: Use same XML files as on Atys	2016-01-24 17:08:32 +01:00
kervala	628c2b1d80	Merge with develop	2016-01-16 10:52:18 +01:00
kervala	6a5fc56ce0	Merge with develop	2016-01-13 20:05:06 +01:00
kervala	7879ca7566	Merge with develop	2016-01-02 20:29:55 +01:00
kervala	1354d99609	Merge with develop	2016-01-02 17:11:59 +01:00
kervala	4f24898102	Merge with develop	2015-12-29 22:36:04 +01:00
kervala	1454a3bc67	Merge with develop	2015-12-29 18:03:21 +01:00
kervala	5752e8a04b	Changed: Updated translations	2015-12-18 13:02:31 +01:00