No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 . |
||
|---|---|---|
| .. | ||
| FLOSS-exception.txt | ||
| GPL-license.txt | ||
| LICENSE-logos.txt | ||
| LICENSE-source.txt | ||
| contributions.txt | ||
| releasenotes-where.txt | ||
No conflicts in the merge. Result of: svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 . |
||
|---|---|---|
| .. | ||
| FLOSS-exception.txt | ||
| GPL-license.txt | ||
| LICENSE-logos.txt | ||
| LICENSE-source.txt | ||
| contributions.txt | ||
| releasenotes-where.txt | ||