[opensource-dev] recent viewer-development changes

Tank Master jaeger_reg at hotmail.com
Thu May 31 23:52:46 PDT 2012


viewer-development was moved to a new folder and a new viewer-development repo was recreated with a different set of changes in it that differs from the old one. This is why you got merge conflicts.~TM
 Date: Thu, 31 May 2012 19:31:49 -0700
From: nickyperian at yahoo.com
To: opensource-dev at lists.secondlife.com
Subject: [opensource-dev] recent viewer-development changes

I normally hg pull into a local base viewer-development repo and then cd into my work repo, hg fetch from base and it usually handles my local changes with a default merge cleanly.
This last weeks changes did not cleanly merge with about 8-10 files requiring a run through kdiff3 merge tool. Then, at the end I still had extra references to llxuixml.lib in indra/newview/CMakeLists.txt.
Any one else have merge issues with viewer-development?
Is this the notice that viewer-release is to be used for open source development?
Nicky
_______________________________________________
Policies and (un)subscribe information available here:
http://wiki.secondlife.com/wiki/OpenSource-Dev
Please read the policies before posting to keep unmoderated posting privileges 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.secondlife.com/pipermail/opensource-dev/attachments/20120531/8329db8b/attachment.htm 


More information about the opensource-dev mailing list