From f6ad1899ff0770ca32eba98cda7eaed51120d72a Mon Sep 17 00:00:00 2001 From: Wolfgang Wiedmeyer Date: Sat, 6 May 2017 22:20:41 +0200 Subject: Switch repos with custom branches and mirror repos to git.replicant.us Avoids merge conflicts when merging the dev branch. Signed-off-by: Wolfgang Wiedmeyer --- default.xml | 506 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 253 insertions(+), 253 deletions(-) diff --git a/default.xml b/default.xml index 6d3dfd5..8a75145 100644 --- a/default.xml +++ b/default.xml @@ -28,276 +28,276 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - - - - - + + + + + - - + + - - - - + + + + - - - - - - - - + + + + + + + + - + - - - - - + + + + + - + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + @@ -510,10 +510,10 @@ - - - - + + + + @@ -524,12 +524,12 @@ - + - - + + - + -- cgit v1.2.3