<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-01-17)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-01-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* shared/start/start.S: Remove conflict lines in comments.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/ChangeLog.diff?r1=text&tr1=1.240&r2=text&tr2=1.241&diff_format=h">M</a></td><td width='1%'>1.241</td><td width='100%'>c/src/lib/libbsp/powerpc/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/c/src/lib/libbsp/powerpc/shared/start/start.S.diff?r1=text&tr1=1.26&r2=text&tr2=1.27&diff_format=h">M</a></td><td width='1%'>1.27</td><td width='100%'>c/src/lib/libbsp/powerpc/shared/start/start.S</td></tr>
</table>
<pre>
<font color='#006600'>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
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-01-17 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * shared/start/start.S: Remove conflict lines in comments.
+
</font> 2010-12-30 Sebastian Huber <sebastian.huber@embedded-brains.de>
* shared/uboot_dump_bdinfo.c: Include <bsp/u-boot.h> if necessary.
<font color='#006600'>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
</font><font color='#997700'>@@ -7,11 +7,7 @@
</font> * found in found in the file LICENSE in this distribution or at
* http://www.rtems.com/license/LICENSE.
*
<font color='#880000'>-<<<<<<< start.S
</font> * $Id$
<font color='#880000'>-=======
- * $Id$
->>>>>>> 1.25
</font> *
*/
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>