Commit Graph

3 Commits

Author SHA1 Message Date
John Firebaugh fa01cfbbf0 Smarter tag conflict merging (fixes #943) 2013-03-08 11:00:14 -08:00
Tom MacWright 5838f05116 Merge tags without a space, fixes #941 2013-03-08 10:51:44 -05:00
John Firebaugh 843baa11c0 graph -> core
This matches how it's described in ARCHITECTURE.md.
2013-02-09 15:18:54 -08:00