5774 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nimetu	25f6f1980f	Merge with develop	2016-07-09 14:59:22 +03:00
kervala	a3b8a2749e	Merge with develop	2016-07-09 13:48:03 +02:00
kervala	512a34f128	Merge with develop	2016-07-09 08:56:10 +02:00
Nimetu	2ce1a63026	Merge with develop	2016-07-07 01:01:00 +03:00
Riasan	391706c1d8	Fix: Bad Position of Text after fix the Text High	2016-07-02 23:07:47 +02:00
Nimetu	62e5552859	Merge with develop	2016-07-01 23:38:32 +03:00
kervala	7df642535b	Merge with develop	2016-07-01 10:42:21 +02:00
kervala	ec1e27acca	Merge with develop	2016-06-27 11:51:59 +02:00
kervala	120d2d7dba	Merge with develop	2016-06-26 19:43:53 +02:00
Nimetu	975ed523be	Merge with develop	2016-06-25 22:30:51 +03:00
kervala	ad98793560	Merge with develop	2016-06-19 21:10:23 +02:00
kervala	f54109d279	Merge with develop	2016-06-18 22:41:12 +02:00
Nimetu	1bff654c7b	Merge with develop	2016-06-16 23:32:47 +03:00
kervala	41ef412c0c	Merge with develop	2016-06-16 17:16:27 +02:00
kervala	5e75d9846d	Merge with develop	2016-06-14 23:00:20 +02:00
kervala	e22cc2acf2	Merge with develop	2016-06-14 20:18:10 +02:00
kervala	3ae8a19af1	Merge with develop	2016-06-12 15:44:48 +02:00
Nimetu	8f9d7078bd	Merge with develop	2016-06-12 12:49:14 +03:00
kervala	8da49a8189	Merge with develop	2016-06-11 20:49:56 +02:00
kervala	8ab7ef6149	Merge with develop	2016-06-11 20:32:19 +02:00
kervala	e3c977ee57	Merge with develop	2016-06-11 17:06:08 +02:00
kervala	a096a9ccff	Merge with develop	2016-06-07 20:01:47 +02:00
kervala	2275e55db9	Merge with develop	2016-06-07 13:32:06 +02:00
kervala	db686dc05c	Merge with develop	2016-06-04 20:11:55 +02:00
kervala	d5b086b0c8	Merge with develop	2016-06-04 17:05:41 +02:00
Nimetu	dca7c1f40b	Merge with develop	2016-06-04 10:36:21 +03:00
kervala	d6fc8af573	Merge with develop	2016-05-30 17:51:54 +02:00
kervala	c4f5512b24	Merge with develop	2016-05-29 20:38:55 +02:00
kervala	ac448eac18	Merge with develop	2016-05-27 22:24:20 +02:00
kervala	6fbf8c5326	Merge with develop	2016-05-26 19:36:25 +02:00
kervala	ed03eb0a02	Merge with develop	2016-05-24 11:25:04 +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	1656e82303	Merge with develop	2016-05-18 14:31:14 +02:00
kervala	9340cb4449	Merge with develop	2016-05-18 09:57:33 +02:00
kervala	0c2cdd108e	Merge with develop	2016-05-17 20:50:14 +02:00
kervala	0766c4766f	Merge with develop	2016-05-17 11:02:02 +02:00
kervala	3b4b071839	Merge with develop	2016-05-16 20:33:43 +02:00
kervala	00e99132c7	Merge with develop	2016-05-16 18:20:14 +02:00
kervala	16ce9a7964	Merge with develop	2016-05-16 18:17:40 +02:00
kervala	cd89e4c348	Merge with develop	2016-05-16 16:50:11 +02:00
kervala	9a61bd9a7c	Merge with develop	2016-05-16 16:31:30 +02:00
kervala	b85c2753a8	Merge with develop	2016-05-16 11:13:45 +02:00
kervala	ece22ab9f3	Merge with develop	2016-05-15 12:05:19 +02:00
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00
Nimetu	13bef3b94d	Merge with develop	2016-05-14 13:47:03 +03:00
kervala	673fb8d52a	Merge with develop	2016-05-13 20:55:24 +02:00
Nimetu	8c7086fa9d	Merge with develop	2016-05-13 13:58:33 +03:00
kervala	5648f63a2f	Merge with develop	2016-05-12 20:03:24 +02:00
kervala	4cf6c0268a	Changed: Updated translations	2016-05-12 19:59:08 +02:00
kervala	5bbd69cbe0	Merge with develop	2016-05-12 19:57:37 +02:00