[Bf-committers] [Bf-blender-cvs] [48e99c0] master: Revert changes to submodules

Lukas Tönne lukas.toenne at gmail.com
Mon Mar 10 10:22:47 CET 2014


Thanks so much! I'm not sure how this happened, it's all very much hidden
... Sorry again


On Mon, Mar 10, 2014 at 10:19 AM, Sergey Sharybin
<noreply at git.blender.org>wrote:

> Commit: 48e99c0820267ecefe05482b654bf484e037bbae
> Author: Sergey Sharybin
> Date:   Mon Mar 10 15:17:22 2014 +0600
> https://developer.blender.org/rB48e99c0820267ecefe05482b654bf484e037bbae
>
> Revert changes to submodules
>
> NEVER use `git commit .` or stage submodules. Leave it to platform
> maintainers!
>
> See [1] where you'll find few hooks which would help you preventing
> accidental commit of submodules.
>
> [1] http://wiki.blender.org/index.php/User:Nazg-gul/DevTools#Git_hooks
>
> ===================================================================
>
> M       release/datafiles/locale
> M       release/scripts/addons
> M       release/scripts/addons_contrib
> M       scons
>
> ===================================================================
>
> diff --git a/release/datafiles/locale b/release/datafiles/locale
> index cb1967c..c842f10 160000
> --- a/release/datafiles/locale
> +++ b/release/datafiles/locale
> @@ -1 +1 @@
> -Subproject commit cb1967cc63a6d2d75d2b59cdf91c5f5645285aea
> +Subproject commit c842f10f94dd7e5b8a5f28b1ece91cff3890aed3
> diff --git a/release/scripts/addons b/release/scripts/addons
> index c50944e..8ad356e 160000
> --- a/release/scripts/addons
> +++ b/release/scripts/addons
> @@ -1 +1 @@
> -Subproject commit c50944e808d6c74148237e85866e893628f0fee6
> +Subproject commit 8ad356e3324cddef42d41f9b9b588ef1ebd2f8bf
> diff --git a/release/scripts/addons_contrib
> b/release/scripts/addons_contrib
> index 31545d2..7485bc6 160000
> --- a/release/scripts/addons_contrib
> +++ b/release/scripts/addons_contrib
> @@ -1 +1 @@
> -Subproject commit 31545d25c9cb41d271a3f3ef84d327708572290e
> +Subproject commit 7485bc6b11e32e6c9d4d13b273ec7a2d8eddf594
> diff --git a/scons b/scons
> index 2d6ebcb..59512aa 160000
> --- a/scons
> +++ b/scons
> @@ -1 +1 @@
> -Subproject commit 2d6ebcb23909058b846aa232ecb2fee497924cf8
> +Subproject commit 59512aadd1d16d7b9327f0eefafb23513b4f2137
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>


More information about the Bf-committers mailing list