Commit Graph

1 Commits

Author SHA1 Message Date
Timothy Gu 262aa647f0 Merge branch 'stable'
Conflicts:
	Makefile
	src/gd.mk
	src/gdal.mk
	src/imagemagick.mk
	src/pcl.mk
	src/qt.mk
2014-08-29 17:58:30 -07:00