Dane Springmeyer 03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	src/deepcopy.cpp
	src/expression.cpp
	src/rule.cpp
2013-11-13 20:00:13 -08:00
..
2013-11-04 12:39:10 +00:00
2013-11-07 20:09:22 -08:00
2013-07-23 18:41:59 -04:00
2013-10-05 15:37:29 -07:00
2013-01-21 14:15:08 -08:00
2013-11-08 19:11:06 -08:00
2013-11-03 23:07:03 -08:00
2013-09-18 19:51:14 -07:00
2013-10-11 13:39:39 +01:00
2012-02-01 17:53:35 -08:00
2012-02-01 17:53:35 -08:00
2013-02-23 22:38:16 +08:00
2013-05-24 16:45:02 -07:00
2013-10-11 12:36:04 +01:00
2013-11-03 23:07:02 -08:00
2012-05-15 14:40:24 +01:00
2013-10-02 09:42:03 +01:00
2013-09-26 19:29:05 -07:00
2013-07-19 15:46:01 -04:00
2013-01-21 14:15:08 -08:00
2013-11-13 18:47:38 -08:00
2013-06-28 15:54:04 -04:00
2013-01-21 14:15:08 -08:00
2013-10-21 16:46:41 +01:00
2013-05-24 16:45:02 -07:00
2013-02-26 11:02:48 -05:00
2013-01-21 14:15:08 -08:00
2013-01-21 14:15:08 -08:00
2013-01-21 14:15:08 -08:00
2013-10-11 13:39:39 +01:00
2013-10-11 12:36:04 +01:00
2013-09-25 20:04:31 -07:00
2013-01-21 14:15:08 -08:00
2013-09-19 18:01:51 -07:00
2012-02-01 17:53:35 -08:00
2013-10-11 12:36:04 +01:00
2013-06-02 20:19:33 -07:00
2012-04-16 21:19:58 -07:00
2013-04-24 16:40:35 +01:00
2013-10-09 15:32:00 +01:00
2013-09-25 21:35:25 -07:00
2013-01-27 23:53:37 -05:00
2013-02-20 10:46:56 -08:00
2012-03-13 09:02:53 +01:00
2013-06-21 12:00:48 -07:00