Restored 'libdelaunay/SAVE/2011-12-24-030000' Restored 'libdelaunay/SAVE/2011-12-24-030000/delaunay.c' Restored 'libdelaunay/SAVE/2011-12-24-030000/delaunay.h' Restored 'libdelaunay/SAVE/2011-12-24-030000/delgrid.c' Restored 'libdelaunay/SAVE/2011-12-24-030000/delrandom.c' Restored 'libgeo/SAVE/2011-12-24-020000' Restored 'libgeo/SAVE/2011-12-24-020000/hr2.c' Restored 'libgeo/SAVE/2011-12-24-020000/hr2.h' Restored 'libgeo/SAVE/2011-12-24-020000/r2.c' Restored 'libgeo/SAVE/2011-12-24-020000/r2.h' Restored 'libgeo/SAVE/2011-12-24-020000/r2x2.c' Restored 'libgeo/SAVE/2011-12-24-020000/r2x2.h' Restored 'libift/SAVE/2007-12-31' Restored 'libift/SAVE/2007-12-31/ift.c' Restored 'libift/SAVE/2007-12-31/ift.h' Restored 'libift/SAVE/2007-12-31/ift_functions.c' Restored 'libift/SAVE/2007-12-31/ift_functions.h' Restored 'libift/SAVE/2007-12-31/ift_image.c' Restored 'libift/SAVE/2007-12-31/ift_image.h' Restored 'libift/SAVE/2007-12-31/ift_plot.c' Restored 'libift/SAVE/2007-12-31/ift_plot.h' Restored 'libift/SAVE/2007-12-31/ift_queue.c' Restored 'libift/SAVE/2007-12-31/ift_queue.h' Restored 'libift/SAVE/2007-12-31/pnmift.c' Restored 'libift/SAVE/2007-12-31/pnmift.h' Restored 'libift/SAVE/2007-12-31/tests' Restored 'libift/SAVE/2007-12-31/tests/Makefile' Restored 'libift/SAVE/2007-12-31/tests/cleanup-clicks.htm' Restored 'libift/SAVE/2007-12-31/tests/figs1-1-seeds.txt' Restored 'libift/SAVE/2007-12-31/tests/figs1-1.doit' Restored 'libift/SAVE/2007-12-31/tests/ladys-1-seeds.txt' Restored 'libift/SAVE/2007-12-31/tests/ladys-1.doit' Restored 'libift/SAVE/2007-12-31/tests/ladys-2.doit' Restored 'libift/SAVE/2007-12-31/tests/mrng3-1-seeds.txt' Restored 'libift/SAVE/2007-12-31/tests/mrng3-1.doit' Restored 'libift/SAVE/2007-12-31/tests/tree3-1-seeds.txt' Restored 'libift/SAVE/2007-12-31/tests/tree3-1.doit' Restored 'libift/SAVE/2007-12-31/tests/tree3-gr-1.doit' Restored 'libift/SAVE/2007-12-31/tests/unifm-1-seeds.txt' Restored 'libift/SAVE/2007-12-31/tests/unifm-1.doit' Restored 'libift/SAVE/2007-12-31/tests/unifm-2-seeds.txt' Restored 'libift/SAVE/2007-12-31/tests/unifm-2.doit' Restored 'libift/SAVE/2007-12-31/tests/unifm-3-seeds.txt' Restored 'libift/SAVE/2007-12-31/tests/unifm-3.doit' Restored 'libift/SAVE/2010-06-28-afalcao' Restored 'libift/SAVE/2010-06-28-afalcao/COPYING' Restored 'libift/SAVE/2010-06-28-afalcao/Makefile' Restored 'libift/SAVE/2010-06-28-afalcao/README' Restored 'libift/SAVE/2010-06-28-afalcao/data' Restored 'libift/SAVE/2010-06-28-afalcao/data/caudate.pgm' Restored 'libift/SAVE/2010-06-28-afalcao/data/cells.pgm' Restored 'libift/SAVE/2010-06-28-afalcao/data/cerebellum.pgm' Restored 'libift/SAVE/2010-06-28-afalcao/data/geomask.pgm' Restored 'libift/SAVE/2010-06-28-afalcao/data/knee.pgm' Restored 'libift/SAVE/2010-06-28-afalcao/data/msskel.pgm' Restored 'libift/SAVE/2010-06-28-afalcao/data/wrist.pgm' Restored 'libift/SAVE/2010-06-28-afalcao/examples' Restored 'libift/SAVE/2010-06-28-afalcao/examples/Makefile' Restored 'libift/SAVE/2010-06-28-afalcao/examples/ctrack.c' Restored 'libift/SAVE/2010-06-28-afalcao/examples/edt.c' Restored 'libift/SAVE/2010-06-28-afalcao/examples/geodesic.c' Restored 'libift/SAVE/2010-06-28-afalcao/examples/graph.c' Restored 'libift/SAVE/2010-06-28-afalcao/examples/graph1.txt' Restored 'libift/SAVE/2010-06-28-afalcao/examples/graph2.txt' Restored 'libift/SAVE/2010-06-28-afalcao/examples/localreconstr.c' Restored 'libift/SAVE/2010-06-28-afalcao/examples/msskel.c' Restored 'libift/SAVE/2010-06-28-afalcao/examples/reconstr.c' Restored 'libift/SAVE/2010-06-28-afalcao/examples/seeds.txt' Restored 'libift/SAVE/2010-06-28-afalcao/examples/watershed.c' Restored 'libift/SAVE/2010-06-28-afalcao/src' Restored 'libift/SAVE/2010-06-28-afalcao/src/adjacency.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/adjacency.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/annimg.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/annimg.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/common.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/common.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/comptime.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/comptime.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/genift.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/genift.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/gift.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/image.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/image.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/queue.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/queue.h' Restored 'libift/SAVE/2010-06-28-afalcao/src/seeds.c' Restored 'libift/SAVE/2010-06-28-afalcao/src/seeds.h' Restored 'libimg/SAVE/2012-01-07' Restored 'libimg/SAVE/2012-01-07/float_image_interpolate.c' Restored 'libimg/SAVE/2012-01-07/float_image_interpolate.h' Restored 'liblsq/SAVE/2014-05-30' Restored 'liblsq/SAVE/2014-05-30/lsq.c' Restored 'liblsq/SAVE/2014-05-30/lsq.h' Restored 'liblsq/SAVE/2014-05-30/lsq_array.c' Restored 'liblsq/SAVE/2014-05-30/lsq_array.h' Restored 'liblsq/SAVE/2014-05-30/lsq_robust.c' Restored 'liblsq/SAVE/2014-05-30/lsq_robust.h' Restored 'libeps/tests/450_testplot2D/Deps.make' Restored 'libeps/tests/450_testplot2D/out/plot2D_qua.eps' Restored 'libeps/tests/450_testplot2D/out/plot2D_tri.eps' Restored 'libnmsim_e/tests/360_elem_net_sim/plot_potentials.sh' Restored 'libnmsim_e/tests/410_elem_net_sim_stats/Deps.make' Restored 'libnmsim_e/tests/420_elem_neuron_trace_stats/Deps.make' Restored 'libtsai/tests/test_calib_guess/test_calib_guess' Restored 'libtsai/tests/test_calib_opt/test_calib_opt' Restored 'libtsai/tests/test_camera_plot/test_camera_plot' Skipped 'libjsaudio/README.md' -- An obstructing working copy was found Skipped 'libnmsim_e/README.md' -- An obstructing working copy was found Skipped 'libnmsim_e/nmsim_elem_net_sim_group_stats.c' -- An obstructing working copy was found Skipped 'libnmsim_e/nmsim_elem_net_sim_group_stats.h' -- An obstructing working copy was found Skipped 'libnmsim_e/nmsim_elem_net_sim_stats.c' -- An obstructing working copy was found Skipped 'libnmsim_e/nmsim_elem_net_sim_stats.h' -- An obstructing working copy was found Skipped 'libnmsim_e/tests/410_elem_net_sim_stats' -- An obstructing working copy was found Skipped 'libnmsim_e/tests/420_elem_neuron_trace_stats' -- An obstructing working copy was found Summary of conflicts: UU libjsaudio/00-README UU libnmsim_e/00-README UU libnmsim_e/Makefile UU libnmsim_e/nmsim_elem_net_sim.c UU libnmsim_e/nmsim_elem_net_sim.h UU libnmsim_e/nmsim_elem_net_trace.c UU libnmsim_e/nmsim_elem_net_trace.h UU libnmsim_e/nmsim_elem_neuron_trace.c UU libnmsim_e/nmsim_elem_neuron_trace.h UU libnmsim_e/nmsim_elem_neuron_trace_entry.c UU libnmsim_e/nmsim_elem_neuron_trace_entry.h UU libnmsim_e/nmsim_elem_neuron_trace_stats.c UU libnmsim_e/nmsim_elem_neuron_trace_stats.h UU libnmsim_e/tests/330_elem_neuron_trace/nmsim_test_330_elem_neuron_trace.c UU libnmsim_e/tests/355_elem_net_trace/Makefile UU libnmsim_e/tests/355_elem_net_trace/nmsim_test_355_elem_net_trace.c UU libnmsim_e/tests/360_elem_net_sim/Makefile UU libnmsim_e/tests/360_elem_net_sim/nmsim_test_360_elem_net_sim.c Updated to revision 36. Updating '.':