Revision: 841 http://trac.macosforge.org/projects/darwinbuild/changeset/841 Author: wsiegrist@apple.com Date: 2010-06-15 14:36:06 -0700 (Tue, 15 Jun 2010) Log Message: ----------- Remove stray merge info Property Changed: ---------------- trunk/darwinbuild/darwinbuild.in trunk/darwinbuild/darwinmaster.in trunk/darwinbuild/installXcode.in trunk/darwinbuild/packageRoots.in trunk/darwinbuild/thinPackages.in Property changes on: trunk/darwinbuild/darwinbuild.in ___________________________________________________________________ Deleted: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /branches/PR-6497694/darwinbuild/darwinbuild.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinbuild.in:632-650 /branches/PR-6688645/darwinbuild/darwinbuild.in:479-490 /branches/PR-6722857/darwinbuild/darwinbuild.in:495-499 /branches/PR-6729491/darwinbuild/darwinbuild.in:655-664 /branches/PR-6973110/darwinbuild/darwinbuild.in:804-813 /branches/PR-7250612/darwinbuild/darwinbuild.in:635-650 /branches/PR-7341154/darwinbuild/darwinbuild.in:682-694 /branches/PR-7431723/darwinbuild/darwinbuild.in:660-664 /branches/PR-7461534/darwinbuild/darwinbuild.in:650-664 /branches/PR-7489777/darwinbuild/darwinbuild.in:676-731 /branches/PR-7529688/darwinbuild/darwinbuild.in:692-694 /branches/PR-7593824/darwinbuild/darwinbuild.in:739-772 /branches/PR-7598640/darwinbuild/darwinbuild.in:703-731 /branches/PR-7748469/darwinbuild/darwinbuild.in:777-785 /branches/PR-7765119/darwinbuild/darwinbuild.in:790-791 /branches/PR-7798586/darwinbuild/darwinbuild.in:796-799 /branches/PR-7935095/darwinbuild/darwinbuild.in:819-821 Property changes on: trunk/darwinbuild/darwinmaster.in ___________________________________________________________________ Deleted: svn:mergeinfo - /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /branches/PR-6497694/darwinbuild/darwinmaster.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/darwinmaster.in:632-650 /branches/PR-6688645/darwinbuild/darwinmaster.sh.in:479-490 /branches/PR-6722857/darwinbuild/darwinmaster.sh.in:495-499 /branches/PR-6729491/darwinbuild/darwinmaster.in:655-664 /branches/PR-6973110/darwinbuild/darwinmaster.in:804-813 /branches/PR-7250612/darwinbuild/darwinmaster.in:635-650 /branches/PR-7341154/darwinbuild/darwinmaster.in:682-694 /branches/PR-7431723/darwinbuild/darwinmaster.in:660-664 /branches/PR-7461534/darwinbuild/darwinmaster.in:650-664 /branches/PR-7489777/darwinbuild/darwinmaster.in:676-731 /branches/PR-7529688/darwinbuild/darwinmaster.in:692-694 /branches/PR-7593824/darwinbuild/darwinmaster.in:739-772 /branches/PR-7598640/darwinbuild/darwinmaster.in:703-731 /branches/PR-7748469/darwinbuild/darwinmaster.in:777-785 /branches/PR-7765119/darwinbuild/darwinmaster.in:790-791 /branches/PR-7798586/darwinbuild/darwinmaster.in:796-799 /branches/PR-7935095/darwinbuild/darwinmaster.in:819-821 Property changes on: trunk/darwinbuild/installXcode.in ___________________________________________________________________ Deleted: svn:mergeinfo - /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /branches/PR-6497694/darwinbuild/installXcode.in:466-468,471 /branches/PR-6634286/darwinbuild/installXcode.in:632-650 /branches/PR-6688645/darwinbuild/installXcode.in:479-490 /branches/PR-6722857/darwinbuild/installXcode.in:495-499 /branches/PR-6729491/darwinbuild/installXcode.in:655-664 /branches/PR-6973110/darwinbuild/installXcode.in:804-813 /branches/PR-7250612/darwinbuild/installXcode.in:635-650 /branches/PR-7341154/darwinbuild/installXcode.in:682-694 /branches/PR-7431723/darwinbuild/installXcode.in:660-664 /branches/PR-7461534/darwinbuild/installXcode.in:650-664 /branches/PR-7489777/darwinbuild/installXcode.in:676-731 /branches/PR-7529688/darwinbuild/installXcode.in:692-694 /branches/PR-7593824/darwinbuild/installXcode.in:739-772 /branches/PR-7598640/darwinbuild/installXcode.in:703-731 /branches/PR-7748469/darwinbuild/installXcode.in:777-785 /branches/PR-7765119/darwinbuild/installXcode.in:790-791 /branches/PR-7798586/darwinbuild/installXcode.in:796-799 /branches/PR-7935095/darwinbuild/installXcode.in:819-821 Property changes on: trunk/darwinbuild/packageRoots.in ___________________________________________________________________ Deleted: svn:mergeinfo - /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /branches/PR-6497694/darwinbuild/packageRoots.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/packageRoots.in:632-650 /branches/PR-6688645/darwinbuild/packageRoots.sh.in:479-490 /branches/PR-6722857/darwinbuild/packageRoots.sh.in:495-499 /branches/PR-6729491/darwinbuild/packageRoots.in:655-664 /branches/PR-6973110/darwinbuild/packageRoots.in:804-813 /branches/PR-7250612/darwinbuild/packageRoots.in:635-650 /branches/PR-7341154/darwinbuild/packageRoots.in:682-694 /branches/PR-7431723/darwinbuild/packageRoots.in:660-664 /branches/PR-7461534/darwinbuild/packageRoots.in:650-664 /branches/PR-7489777/darwinbuild/packageRoots.in:676-731 /branches/PR-7529688/darwinbuild/packageRoots.in:692-694 /branches/PR-7593824/darwinbuild/packageRoots.in:739-772 /branches/PR-7598640/darwinbuild/packageRoots.in:703-731 /branches/PR-7748469/darwinbuild/packageRoots.in:777-785 /branches/PR-7765119/darwinbuild/packageRoots.in:790-791 /branches/PR-7798586/darwinbuild/packageRoots.in:796-799 /branches/PR-7935095/darwinbuild/packageRoots.in:819-821 Property changes on: trunk/darwinbuild/thinPackages.in ___________________________________________________________________ Deleted: svn:mergeinfo - /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /branches/PR-6497694/darwinbuild/thinPackages.sh.in:466-468,471 /branches/PR-6634286/darwinbuild/thinPackages.in:632-650 /branches/PR-6688645/darwinbuild/thinPackages.sh.in:479-490 /branches/PR-6722857/darwinbuild/thinPackages.sh.in:495-499 /branches/PR-6729491/darwinbuild/thinPackages.in:655-664 /branches/PR-6973110/darwinbuild/thinPackages.in:804-813 /branches/PR-7250612/darwinbuild/thinPackages.in:635-650 /branches/PR-7341154/darwinbuild/thinPackages.in:682-694 /branches/PR-7431723/darwinbuild/thinPackages.in:660-664 /branches/PR-7461534/darwinbuild/thinPackages.in:650-664 /branches/PR-7489777/darwinbuild/thinPackages.in:676-731 /branches/PR-7529688/darwinbuild/thinPackages.in:692-694 /branches/PR-7593824/darwinbuild/thinPackages.in:739-772 /branches/PR-7598640/darwinbuild/thinPackages.in:703-731 /branches/PR-7748469/darwinbuild/thinPackages.in:777-785 /branches/PR-7765119/darwinbuild/thinPackages.in:790-791 /branches/PR-7798586/darwinbuild/thinPackages.in:796-799 /branches/PR-7935095/darwinbuild/thinPackages.in:819-821