git.shadowcat.co.uk Git - gitmo/Class-MOP.git/commit

projects / gitmo/Class-MOP.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f138217 5149935)

author	gfx <g.psy.va@gmail.com>
	Sat, 15 Aug 2009 12:30:52 +0000 (21:30 +0900)
committer	gfx <g.psy.va@gmail.com>
	Sat, 15 Aug 2009 12:30:52 +0000 (21:30 +0900)
commit	ffec3ec39c4145cbfa8c07cadf5a5d38f4b3cac7
tree	a4333a544996104da2cde67253ddcc2849929615	tree \| snapshot
parent	f138217b88ebc9fd9cd3f489530c71e11eebb829	commit \| diff
parent	51499350804c43498c99f5542dd0f07219c115d3	commit \| diff

Merge commit 'origin/topic/xs-attr-template' into topic/unified-method-generation-w-xs

Conflicts:
lib/Class/MOP/Class.pm
xs/Class.xs

14 files changed:

lib/Class/MOP/Attribute.pm	diff1 \|	diff2 \|	blob \| history
lib/Class/MOP/Class.pm	diff1 \|	diff2 \|	blob \| history
lib/Class/MOP/Instance.pm	diff1 \|	diff2 \|	blob \| history
lib/Class/MOP/Method.pm	diff1 \|	diff2 \|	blob \| history
lib/Class/MOP/Method/Accessor.pm	diff1 \|	diff2 \|	blob \| history
lib/Class/MOP/Method/Constructor.pm	diff1 \|	diff2 \|	blob \| history
lib/Class/MOP/Method/Generated.pm	diff1 \|	diff2 \|	blob \| history
lib/Class/MOP/Method/Inlined.pm	diff1 \|	diff2 \|	blob \| history
mop.c	diff1 \|	diff2 \|	blob \| history
mop.h	diff1 \|	diff2 \|	blob \| history
xs/Class.xs	\|	diff2 \|	blob \| history
xs/MOP.xs	diff1 \|	diff2 \|	blob \| history
xs/MethodAccessor.xs	\|	diff2 \|	blob \| history
xs/Package.xs	diff1 \|	diff2 \|	blob \| history

A Meta Object Protocol for Perl 5 - now lives at https://github.com/moose/Moose