James Gray 4e0b3eb173 Merge tag '2.5.2' ...

Conflicts:
	lime/graphics/utils/ImageDataUtil.hx

2015-08-06 18:04:28 -05:00

..

include

Merge tag '2.5.2'

2015-08-06 18:04:28 -05:00

lib

Quiet 'known incorrect' color profile messages from libpng

2015-07-17 08:40:45 -07:00

src

Merge tag '2.5.2'

2015-08-06 18:04:28 -05:00

Build.xml

Merge tag '2.5.2'

2015-08-06 18:04:28 -05:00