zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-03 02:23:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge cpu into ppu

Browse Source
This commit is contained in:
Clément Le Bihan
2020-05-14 18:22:07 +02:00
parent c3a24f0238 24bcafeea3
commit b41a9fe989
9 changed files with 104 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/ui_cpu.h
+4
View File
@@ -1,7 +1,11 @@
/********************************************************************************
** Form generated from reading UI file 'cpu.ui'
**
<<<<<<< HEAD
** Created by: Qt User Interface Compiler version 5.13.2
=======
** Created by: Qt User Interface Compiler version 5.14.2
>>>>>>> 24bcafeea3896022704904815d263f69f22e5096
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/