change log for rtems (2011-01-17)

[rtems-vc at rtems.org]

 *joel*:
2011-01-17	Joel Sherrill <joel.sherrill at oarcorp.com>

	* shared/start/start.S: Remove conflict lines in comments.

M  1.241  c/src/lib/libbsp/powerpc/ChangeLog
M   1.27  c/src/lib/libbsp/powerpc/shared/start/start.S

diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.240 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.241
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.240	Thu Dec 30 07:01:12 2010
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog	Mon Jan 17 08:48:25 2011
@@ -1,3 +1,7 @@
+2011-01-17	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	* shared/start/start.S: Remove conflict lines in comments.
+
 2010-12-30	Sebastian Huber <sebastian.huber at embedded-brains.de>
 
 	* shared/uboot_dump_bdinfo.c: Include <bsp/u-boot.h> if necessary.

diff -u rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26 rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.27
--- rtems/c/src/lib/libbsp/powerpc/shared/start/start.S:1.26	Tue Dec  1 19:51:22 2009
+++ rtems/c/src/lib/libbsp/powerpc/shared/start/start.S	Mon Jan 17 08:48:25 2011
@@ -7,11 +7,7 @@
  *  found in found in the file LICENSE in this distribution or at
  *  http://www.rtems.com/license/LICENSE.
  *
-<<<<<<< start.S
  *  $Id$
-=======
- *  $Id$
->>>>>>> 1.25
  *
  */
 



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110117/6d2d87ec/attachment.html>