livecd/templates/community/version | 2 -
tools/merge-branch | 70 +++++++++++++++++++++----------------
2 files changed, 42 insertions(+), 30 deletions(-)
New commits:
commit 22811f89126bae5c85d0980d218d894f6de75c0e
Author: Arthur Xiong <art...@vyatta.com>
Date: Fri Jan 7 15:43:15 2011 -0800
Vyatta Core 6.2
(cherry picked from commit 303e28c0c2098400f9762bba970254428d175607)
commit dd6091d7c156aca25df87b9ef42570737c417f63
Author: An-Cheng Huang <anch...@vyatta.com>
Date: Tue Jan 4 19:19:49 2011 -0800
change merge-branch to automatically skip .frlog changes.
(cherry picked from commit 9628302dc2c6c70f2a8b5cdd5d418559949c9172)
http://suva.vyatta.com/git/?p=build-iso.git;a=commitdiff;h=22811f89126bae5c85d0980d218d894f6de75c0e
http://suva.vyatta.com/git/?p=build-iso.git;a=commitdiff;h=dd6091d7c156aca25df87b9ef42570737c417f63
_______________________________________________
svn mailing list
svn@mailman.vyatta.com
http://mailman.vyatta.com/mailman/listinfo/svn
