Hold some commits which have been merged forward to a newer dev branch.

- Legacy-Id: 11872
This commit is contained in:
Henrik Levkowetz 2016-08-25 11:25:06 +00:00
parent e555fe9687
commit f026dd64cd

View file

@ -1,5 +1,7 @@
# -*- conf-mode -*-
/branch/proceedings/6.29.1.dev0@11850 # Merged into /branch/proceedings/6.30.1.dev0, will be merged from there
/branch/proceedings/6.29.1.dev0@11856 # Merged into /branch/proceedings/6.30.1.dev0, will be merged from there
/personal/rcross/6.29.1.dev0@11765 # Merged into ^/personal/rjs/6.29.1.dev0@11770, will be merged from there
/personal/rcross/6.29.1.dev0@11768 # Merged into ^/personal/rjs/6.29.1.dev0@11770, will be merged from there