LOL didn't even spot this sorry It might be a good idea to pop *.orig and *.rej into the gitignore file
On Wed, 30 Aug 2017 at 14:17 Emil Velikov <emil.l.veli...@gmail.com> wrote: > On 30 August 2017 at 14:11, Eric Engestrom <e...@engestrom.ch> wrote: > > Fixes: 0ac78dc92582a59d4319 "util: move string_to_uint_map to glsl" > > Cc: Emil Velikov <emil.veli...@collabora.com> > > Signed-off-by: Eric Engestrom <e...@engestrom.ch> > Reviewed-by: Emil Velikov <emil.veli...@collabora.com> > > /me puts on a brown paper bag > > -Emil > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev