URL https://opencores.org/ocsvn/m1_core/m1_core/trunk

Subversion Repositories m1_core

[/] [m1_core/] [tags/] [first/] [tests/] [code.txt] - Blame information for rev 54

Details | Compare with Previous | View Log


<<<<<<< code.txt
23bd0400
3c1fdead
37ffbeef
00000000
27bdffe8
afbe0010
=======
27bdffe8
afbe0010
>>>>>>> 1.2
03a0f021
<<<<<<< code.txt
3c02c1a0
3442c1a0
afc2000c
3c02faba
34421210
afc20008
8fc3000c
8fc20008
00000000
ac620000
00001021
=======
3402cac0
afc20008
8fc30008
3c02c1a0
3442c1a0
ac620000
3402cac0
afc20008
8fc30008
3c02faba
34421210
ac620000
00001021
>>>>>>> 1.2
03c0e821
8fbe0010
27bd0018
03e00008
<<<<<<< code.txt
=======
00000000
00000000
>>>>>>> 1.2
00000000
00000000
<<<<<<< code.txt
 
=======
 
>>>>>>> 1.2

Line No.	Rev	Author	Line
1	2	fafa1971	`<<<<<<< code.txt`
2			`23bd0400`
3			`3c1fdead`
4			`37ffbeef`
5			`00000000`
6			`27bdffe8`
7			`afbe0010`
8			`=======`
9			`27bdffe8`
10			`afbe0010`
11			`>>>>>>> 1.2`
12			`03a0f021`
13			`<<<<<<< code.txt`
14			`3c02c1a0`
15			`3442c1a0`
16			`afc2000c`
17			`3c02faba`
18			`34421210`
19			`afc20008`
20			`8fc3000c`
21			`8fc20008`
22			`00000000`
23			`ac620000`
24			`00001021`
25			`=======`
26			`3402cac0`
27			`afc20008`
28			`8fc30008`
29			`3c02c1a0`
30			`3442c1a0`
31			`ac620000`
32			`3402cac0`
33			`afc20008`
34			`8fc30008`
35			`3c02faba`
36			`34421210`
37			`ac620000`
38			`00001021`
39			`>>>>>>> 1.2`
40			`03c0e821`
41			`8fbe0010`
42			`27bd0018`
43			`03e00008`
44			`<<<<<<< code.txt`
45			`=======`
46			`00000000`
47			`00000000`
48			`>>>>>>> 1.2`
49			`00000000`
50			`00000000`
51			`<<<<<<< code.txt`
52
53			`=======`
54
55			`>>>>>>> 1.2`

Browse

Tools

Subversion Repositories m1_core

[/] [m1_core/] [tags/] [first/] [tests/] [code.txt] - Blame information for rev 54