On 02/02/2015 07:13 PM, Matej Kollar wrote: >> It is a pity that this one can't be merged automatically anymore because >> of 8c31e63 / 3daaad01 >> >> Matej, did you replace everything with 8 spaces? > > It was standard retab procedure with tabstop=8. > So it would be simpler to describe it as "fill with spaces to > the next closest multiple of 8". There might be differences > for files that had explicitly set tabstop to different > value.
I have rebased it fixing conflicts by hand and added some commits that were added later in our internal branch. -- Duncan Mac-Vicar P. - http://www.suse.com/ SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton, HRB 21284 (AG Nürnberg) Maxfeldstraße 5, 90409 Nürnberg, Germany _______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
