fucking merge failure!!! so annoying git merge.

[motonesfpga/motonesfpga.git] / de1_nes / de1_nes.qsf

diff --git a/de1_nes/de1_nes.qsf b/de1_nes/de1_nes.qsf
index bc1e0fc..838954d 100644 (file)
--- a/de1_nes/de1_nes.qsf
+++ b/de1_nes/de1_nes.qsf
@@ -118,9 +118,9 @@ set_global_assignment -name VHDL_FILE mem/prg_rom.vhd
 set_global_assignment -name VHDL_FILE mem/chr_rom.vhd\r
 set_global_assignment -name VHDL_FILE mem/ram.vhd\r
 set_global_assignment -name VHDL_FILE ppu/ppu_registers.vhd\r
-#set_global_assignment -name VHDL_FILE ppu/vga.vhd\r
-#set_global_assignment -name VHDL_FILE ppu/render.vhd\r
-#set_global_assignment -name VHDL_FILE ppu/ppu.vhd\r
+set_global_assignment -name VHDL_FILE ppu/vga.vhd\r
+set_global_assignment -name VHDL_FILE ppu/render.vhd\r
+set_global_assignment -name VHDL_FILE ppu/ppu.vhd\r
 set_global_assignment -name VHDL_FILE cpu/alu.vhd\r
 set_global_assignment -name VHDL_FILE cpu/cpu_registers.vhd\r
 set_global_assignment -name VHDL_FILE cpu/decoder.vhd\r