6 Commits

Author	SHA1	Message	Date
Jesse Beder	7d8627e7ad	Merge from core	2015-01-24 15:59:24 -06:00
Jesse Beder	5f83e4ddf6	Renamed the None enumeration vaules to NoType to avoid a collision with X11's macro	2015-01-24 15:58:14 -06:00
Jesse Beder	7193d3644d	Fix initialize ordering warning	2015-01-24 15:32:04 -06:00
Jesse Beder	e662142cef	Merge core	2015-01-24 14:40:55 -06:00
Jesse Beder	84b5b54732	Add flow/block style setting on Nodes	2015-01-24 13:11:43 -06:00
Jesse Beder	dfbeebc04b	Merge from core	2015-01-24 12:26:16 -06:00