mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-18 00:49:19 +02:00
Merge remote-tracking branch 'origin/lcd_python' into lcd_python
Conflicts: .gitignore Driver.cpp EU07.bpr EU07.res Globals.cpp
This commit is contained in:
10
.gitignore
vendored
10
.gitignore
vendored
@@ -52,10 +52,10 @@ install_manifest.txt
|
||||
*.~h
|
||||
*.~bpr
|
||||
*.~pas
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.sln
|
||||
*.vcxproj
|
||||
*.filters
|
||||
format_all_files.py
|
||||
MaSzyna.opensdf
|
||||
MaSzyna.sdf
|
||||
MaSzyna.sln
|
||||
MaSzyna.vcxproj
|
||||
MaSzyna.vcxproj.filters
|
||||
~$kumentacja zmiennych Python.docx
|
||||
|
||||
Reference in New Issue
Block a user