From 9aa7a5f0b06a65942afcba2ae15347e9d3639bfa Mon Sep 17 00:00:00 2001 From: "jose.rodriguezlabra" Date: Sat, 16 Feb 2019 12:37:12 -0500 Subject: [PATCH] stuff --- lab2CA.cache/wt/webtalk_pa.xml | 108 ++------------------------------- vivado.jou | 12 ++-- vivado_10872.backup.jou | 14 +++++ 3 files changed, 25 insertions(+), 109 deletions(-) create mode 100644 vivado_10872.backup.jou diff --git a/lab2CA.cache/wt/webtalk_pa.xml b/lab2CA.cache/wt/webtalk_pa.xml index a37847f..a0ecba1 100644 --- a/lab2CA.cache/wt/webtalk_pa.xml +++ b/lab2CA.cache/wt/webtalk_pa.xml @@ -3,17 +3,10 @@ -<<<<<<< HEAD - +
- - -======= - -
- + ->>>>>>> 5458d273919a21255992a22a8e59ccb89544f780
@@ -23,104 +16,13 @@ This means code written to parse this file will need to be revisited each subseq - - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 5458d273919a21255992a22a8e59ccb89544f780 +
diff --git a/vivado.jou b/vivado.jou index 6a702df..c0cd505 100644 --- a/vivado.jou +++ b/vivado.jou @@ -1,11 +1,11 @@ #----------------------------------------------------------- -# Vivado v2018.2.1 (64-bit) -# SW Build 2288692 on Thu Jul 26 18:24:02 MDT 2018 -# IP Build 2289599 on Thu Jul 26 21:09:20 MDT 2018 -# Start of session at: Fri Feb 8 18:39:19 2019 -# Process ID: 10872 +# Vivado v2018.3 (64-bit) +# SW Build 2405991 on Thu Dec 6 23:38:27 MST 2018 +# IP Build 2404404 on Fri Dec 7 01:43:56 MST 2018 +# Start of session at: Sat Feb 16 12:34:49 2019 +# Process ID: 15356 # Current directory: C:/Users/JoseIgnacio/CA Lab -# Command line: vivado.exe -gui_launcher_event rodinguilauncherevent16264 C:\Users\JoseIgnacio\CA Lab\lab2CA.xpr +# Command line: vivado.exe -gui_launcher_event rodinguilauncherevent13100 C:\Users\JoseIgnacio\CA Lab\lab2CA.xpr # Log file: C:/Users/JoseIgnacio/CA Lab/vivado.log # Journal file: C:/Users/JoseIgnacio/CA Lab\vivado.jou #----------------------------------------------------------- diff --git a/vivado_10872.backup.jou b/vivado_10872.backup.jou new file mode 100644 index 0000000..6a702df --- /dev/null +++ b/vivado_10872.backup.jou @@ -0,0 +1,14 @@ +#----------------------------------------------------------- +# Vivado v2018.2.1 (64-bit) +# SW Build 2288692 on Thu Jul 26 18:24:02 MDT 2018 +# IP Build 2289599 on Thu Jul 26 21:09:20 MDT 2018 +# Start of session at: Fri Feb 8 18:39:19 2019 +# Process ID: 10872 +# Current directory: C:/Users/JoseIgnacio/CA Lab +# Command line: vivado.exe -gui_launcher_event rodinguilauncherevent16264 C:\Users\JoseIgnacio\CA Lab\lab2CA.xpr +# Log file: C:/Users/JoseIgnacio/CA Lab/vivado.log +# Journal file: C:/Users/JoseIgnacio/CA Lab\vivado.jou +#----------------------------------------------------------- +start_gui +open_project {C:/Users/JoseIgnacio/CA Lab/lab2CA.xpr} +update_compile_order -fileset sources_1