[Bf-committers] Revisions for 2.73a

Joshua Leung aligorith at gmail.com
Tue Jan 20 11:11:20 CET 2015


Re 32ffc63d20908c6433e0e92488be3b5568f81f69

The conflicts are due to the code for the new copy/paste operators. It
should be safe to just skip the changes for those ones. But, if it's going
to be too much of a pain, we may just have to live with having these
crashes and unintentional editing going on.

On Tue, Jan 20, 2015 at 10:29 PM, Campbell Barton <ideasman42 at gmail.com>
wrote:

> RC2 of backport list (sorted by date):
>
> Committed to blender-v2.73-release branch:
>
> ae18fd5937753d1fc420dc8aef78efacabb9750c
> 4fac29ca0e8cc09a3f7bce27f549cc75ffdbb1d4
> 8ebb552a9551abcb3d013b192a0dc9c2ea6f2bcc
> def2ef88b089b69b2f4e1884a916232101edc8ae
> e02af840e1fbafd068d527ade70146141ab16946
> 73955e256678c5873ee83d32f861d7f35b917d57
> b99687169debea80d0777ba83ac185f1f2e04b83
> dec523da877facb0573dccce6d95e5b0d2734707
> 599c8a2c8e4cf1f904c5422916ebfd8d12eebe69
> 1864253db06957ec344e6504b1c33e7f83cdaa99
> 9d02e2626bdec0b230cb71103822c773979c516e
> 301433fe9d3864a454f0d27b9e3809e8e2c76da6
> dcd662c6951c33cb1d72ed693348595227efc9ae
> b77dd130044c43fd12a3ce4adf645ef88d871a50
> 3f0113be4ddb75e1e4dd159e58112e8c45ebdb12
> 653c6f2edd82bdb9b9c4f8357be1ae0ed528b824
> 1994e843d6bb144054356fc54e49f730e843e969
> 6e97db7b3000769c54b0cd7df6a7c93cf62fd9da
> 32ffc63d20908c6433e0e92488be3b5568f81f69
> 45dfb3b74231dcaffcc8677435488b6eb18132de
> 7fd4c440ec2207eb80be13bf14eefa940e39d43e
>
> Cherry picked separately: (conflicted)
> 704494e8cd970832482d550abdbdd6fb5079bb46
> 967f93d1c141ee0b32942f854a51605e004aade1
>
> ----
>
> Ommitted from inital list:
>
> 32ffc63d20908c6433e0e92488be3b5568f81f69
> .. Conflicts, looks to depend on other changes in master.
>
> 18854a65065456d9a92ad9408b7b32f1a70cafae
> .. depends on a feature added in ca9bdf3f286a4c01eb2da1a5689b71737636f659
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers
>


More information about the Bf-committers mailing list