Revision 128bbc1e
ID | 128bbc1ec62fe80449af26140fa073d3f23f0b50 |
Parent | 56476ce6, 51048a04 |
Child | 85b37014 |
Merge branch 'wip-xinfo-fixed' into xseg
Conflicts:
xseg/sys/xsegbd.c [trivial]
Files
- added
- modified
- copied
- renamed
- deleted
ID | 128bbc1ec62fe80449af26140fa073d3f23f0b50 |
Parent | 56476ce6, 51048a04 |
Child | 85b37014 |
Added by Georgios Tsoukalas over 12 years ago
Merge branch 'wip-xinfo-fixed' into xseg
Conflicts:
xseg/sys/xsegbd.c [trivial]