Merge with trunk r38663
authorMiika Hamalainen <blender@miikah.org>
Sun, 24 Jul 2011 18:01:20 +0000 (18:01 +0000)
committerMiika Hamalainen <blender@miikah.org>
Sun, 24 Jul 2011 18:01:20 +0000 (18:01 +0000)
commit35720a4c075c2a0782af173519097a094b5c0165
tree9cd5502a931c0e69a686343a5f64fc67a8e54363
parent36802232d73656cb26987f53c71ade361f9d35ae
parenta22de3f73c28b86f481376d52fbcfd7bb8ee25f2
Merge with trunk r38663
source/blender/editors/interface/interface_templates.c