|
From: | Chris |
Subject: | [Paparazzi-devel] problem with the latest revision? |
Date: | Mon, 22 Nov 2010 01:34:13 +0200 |
User-agent: | Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.15) Gecko/20101027 Thunderbird/3.0.10 |
Any ideas? Here is the output: address@hidden:~/paparazzi3$ svn update D Makefile.install D debian D Doxyfile D AUTHORS C conf C sw D Makefile.sys D Makefile.ac D BUGS D paparazzi D TODO D doc D COPYING D data D pprz_src_test.sh D paparazzi-make D Makefile D README A README Updated to revision 6432. Summary of conflicts: Tree conflicts: 2 address@hidden:~/paparazzi3$
[Prev in Thread] | Current Thread | [Next in Thread] |