Baptiste Daroussin f94594b37a Finish merging from head, messed up in previous attempt		2015-09-12 12:03:02 +00:00
..
Makefile	Finish merging from head, messed up in previous attempt	2015-09-12 12:03:02 +00:00
Makefile.depend	Add META_MODE support.	2015-06-13 19:20:56 +00:00