Blender Git Loki
Git Commits -> Revision 37c56e1
Revision 37c56e1 by Campbell Barton (master) August 7, 2014, 20:00 (GMT) |
Revert "ignore conflict files" This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc. turns out this hides conflicts which we may want to see |
Commit Details:
Full Hash: 37c56e10cdf2a132bec36eb138f416f02c22623f
Parent Commit: 7d20ad6
Lines Changed: +0, -4
1 Modified Path:
/.gitignore (+0, -4) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021