Conflicts resolved. Hadn't used the Resolve command last time. Brilliant.
authorRoland Hess <me@harkyman.com>
Wed, 7 Jan 2009 13:10:31 +0000 (13:10 +0000)
committerRoland Hess <me@harkyman.com>
Wed, 7 Jan 2009 13:10:31 +0000 (13:10 +0000)
commit1ff595a28e541de9cf71708bb7327b8deb0598ac
tree5e8879f272e428991da735349eb79d9d40196e65
parent5ef7b1f76ffc8796b2e5ae58a62fcb451229108b
Conflicts resolved. Hadn't used the Resolve command last time. Brilliant.
source/blender/makesrna/intern/rna_action.c