2013-12-11, 14:36
(2013-12-11, 07:53)MilhouseVH Wrote: @popcornmix - can you rebase your newclock3 branch as it looks as though one or two other commits have gone in to master that are now causing conflicts (eg. 79aee04c3aa8fb0dd4c05cfde84cd13318fed84a which is using the same msgctxt as your texture/GUI res changes). Many thanks!
Rebased.