Auto stash before merge of "master" and "origin/driverupdate"

This commit is contained in:
MHeinrichs
2018-11-26 20:34:01 +01:00
parent 2a19a0b2f7
commit eec9e31a7a
10 changed files with 23 additions and 6 deletions
Binary file not shown.
Binary file not shown.
View File
View File
+2 -2
View File
@@ -2,7 +2,7 @@
<BODY TEXT='#000000' BGCOLOR='#FFFFFF' LINK='#0000EE' VLINK='#551A8B' ALINK='#FF0000'> <BODY TEXT='#000000' BGCOLOR='#FFFFFF' LINK='#0000EE' VLINK='#551A8B' ALINK='#FF0000'>
<TABLE BORDER CELLSPACING=0 CELLPADDING=3 WIDTH='100%'> <TABLE BORDER CELLSPACING=0 CELLPADDING=3 WIDTH='100%'>
<TR ALIGN=CENTER BGCOLOR='#99CCFF'> <TR ALIGN=CENTER BGCOLOR='#99CCFF'>
<TD ALIGN=CENTER COLSPAN='4'><B>LAN_IDE_CP Project Status (06/09/2018 - 21:26:53)</B></TD></TR> <TD ALIGN=CENTER COLSPAN='4'><B>LAN_IDE_CP Project Status (01/26/2017 - 20:59:08)</B></TD></TR>
<TR ALIGN=LEFT> <TR ALIGN=LEFT>
<TD BGCOLOR='#FFFF99'><B>Project File:</B></TD> <TD BGCOLOR='#FFFF99'><B>Project File:</B></TD>
<TD>LAN_IDE.xise</TD> <TD>LAN_IDE.xise</TD>
@@ -77,5 +77,5 @@ System Settings</A>
</TABLE> </TABLE>
<br><center><b>Date Generated:</b> 06/09/2018 - 21:26:53</center> <br><center><b>Date Generated:</b> 11/26/2018 - 20:30:29</center>
</BODY></HTML> </BODY></HTML>
+8
View File
@@ -0,0 +1,8 @@
INTSTYLE=impact
INFILE=C:\Users\Matze\Amiga\Hardwarehacks\Zorro-LAN-IDE\Logic\LAN_IDE\impact.xsl
OUTFILE=C:\Users\Matze\Amiga\Hardwarehacks\Zorro-LAN-IDE\Logic\LAN_IDE\impact.xsl
FAMILY=Single
PART=Single
WORKINGDIR=C:\Users\Matze\Amiga\Hardwarehacks\Zorro-LAN-IDE\Logic\LAN_IDE
LICENSE=iMPACT
USER_INFO=iMPACT
+3 -3
View File
@@ -64,13 +64,13 @@
<ClosedNode>Implement Design/Synthesize - XST</ClosedNode> <ClosedNode>Implement Design/Synthesize - XST</ClosedNode>
</ClosedNodes> </ClosedNodes>
<SelectedItems> <SelectedItems>
<SelectedItem></SelectedItem> <SelectedItem>Configure Target Device</SelectedItem>
</SelectedItems> </SelectedItems>
<ScrollbarPosition orientation="vertical" >0</ScrollbarPosition> <ScrollbarPosition orientation="vertical" >0</ScrollbarPosition>
<ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition> <ScrollbarPosition orientation="horizontal" >0</ScrollbarPosition>
<ViewHeaderState orientation="horizontal" >000000ff000000000000000100000001000000000000000000000000000000000000000000000000e7000000010000000100000000000000000000000064ffffffff000000810000000000000001000000e70000000100000000</ViewHeaderState> <ViewHeaderState orientation="horizontal" >000000ff000000000000000100000001000000000000000000000000000000000000000000000000f8000000010000000100000000000000000000000064ffffffff000000810000000000000001000000f80000000100000000</ViewHeaderState>
<UserChangedColumnWidths orientation="horizontal" >false</UserChangedColumnWidths> <UserChangedColumnWidths orientation="horizontal" >false</UserChangedColumnWidths>
<CurrentItem></CurrentItem> <CurrentItem>Configure Target Device</CurrentItem>
</ItemView> </ItemView>
<SourceProcessView>000000ff00000000000000020000011b0000011b01000000050100000002</SourceProcessView> <SourceProcessView>000000ff00000000000000020000011b0000011b01000000050100000002</SourceProcessView>
<CurrentView>Implementation</CurrentView> <CurrentView>Implementation</CurrentView>
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<report-views version="2.0" > <report-views version="2.0" >
<header> <header>
<DateModified>2018-06-09T21:25:36</DateModified> <DateModified>2018-11-26T20:30:29</DateModified>
<ModuleName>LAN_IDE_CP</ModuleName> <ModuleName>LAN_IDE_CP</ModuleName>
<SummaryTimeStamp>2017-01-26T20:59:08</SummaryTimeStamp> <SummaryTimeStamp>2017-01-26T20:59:08</SummaryTimeStamp>
<SavedFilePath>C:/Users/Matze/Amiga/Hardwarehacks/Zorro-LAN-IDE/Logic/LAN_IDE/iseconfig/LAN_IDE_CP.xreport</SavedFilePath> <SavedFilePath>C:/Users/Matze/Amiga/Hardwarehacks/Zorro-LAN-IDE/Logic/LAN_IDE/iseconfig/LAN_IDE_CP.xreport</SavedFilePath>
Binary file not shown.
+9
View File
@@ -0,0 +1,9 @@
Release 14.7 - WebTalk (P.20131013)
Copyright (c) 1995-2010 Xilinx, Inc. All rights reserved.
WebTalk Summary
----------------
INFO:WebTalk:3 - WebTalk is disabled.
INFO:WebTalk:9 - WebTalk Install setting is OFF.
INFO:WebTalk:6 - WebTalk User setting is ON.