eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

Merge remote-tracking branch 'origin/lcd_python' into lcd_python

Browse Source 
Conflicts:
	.gitignore
	Driver.cpp
	EU07.bpr
	EU07.res
	Globals.cpp
This commit is contained in:
Firleju
2015-06-05 21:10:31 +02:00
parent df45ac21e9 d71ada46d1
commit 1ae3790f6b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@@ -52,10 +52,10 @@ install_manifest.txt
*.~h *.~h
*.~bpr *.~bpr
*.~pas *.~pas
*.opensdf
*.sdf
*.sln
*.vcxproj
*.filters
format_all_files.py format_all_files.py
MaSzyna.opensdf
MaSzyna.sdf
MaSzyna.sln
MaSzyna.vcxproj
MaSzyna.vcxproj.filters
~$kumentacja zmiennych Python.docx ~$kumentacja zmiennych Python.docx