mirror of
				https://github.com/wh201906/Proxmark3GUI.git
				synced 2025-11-04 08:13:22 +08:00 
			
		
		
		
	Merge branch 'dev' of github.com:wh201906/Proxmark3GUI into dev
just for sync
This commit is contained in:
		
						commit
						01e6a134cd
					
				
							
								
								
									
										146
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										146
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -1,73 +1,73 @@
 | 
			
		||||
# This file is used to ignore files which are generated
 | 
			
		||||
# ----------------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
*~
 | 
			
		||||
*.autosave
 | 
			
		||||
*.a
 | 
			
		||||
*.core
 | 
			
		||||
*.moc
 | 
			
		||||
*.o
 | 
			
		||||
*.obj
 | 
			
		||||
*.orig
 | 
			
		||||
*.rej
 | 
			
		||||
*.so
 | 
			
		||||
*.so.*
 | 
			
		||||
*_pch.h.cpp
 | 
			
		||||
*_resource.rc
 | 
			
		||||
*.qm
 | 
			
		||||
.#*
 | 
			
		||||
*.*#
 | 
			
		||||
core
 | 
			
		||||
!core/
 | 
			
		||||
tags
 | 
			
		||||
.DS_Store
 | 
			
		||||
.directory
 | 
			
		||||
*.debug
 | 
			
		||||
Makefile*
 | 
			
		||||
*.prl
 | 
			
		||||
*.app
 | 
			
		||||
moc_*.cpp
 | 
			
		||||
ui_*.h
 | 
			
		||||
qrc_*.cpp
 | 
			
		||||
Thumbs.db
 | 
			
		||||
*.res
 | 
			
		||||
*.rc
 | 
			
		||||
/.qmake.cache
 | 
			
		||||
/.qmake.stash
 | 
			
		||||
 | 
			
		||||
# qtcreator generated files
 | 
			
		||||
*.pro.user*
 | 
			
		||||
 | 
			
		||||
# xemacs temporary files
 | 
			
		||||
*.flc
 | 
			
		||||
 | 
			
		||||
# Vim temporary files
 | 
			
		||||
.*.swp
 | 
			
		||||
 | 
			
		||||
# Visual Studio generated files
 | 
			
		||||
*.ib_pdb_index
 | 
			
		||||
*.idb
 | 
			
		||||
*.ilk
 | 
			
		||||
*.pdb
 | 
			
		||||
*.sln
 | 
			
		||||
*.suo
 | 
			
		||||
*.vcproj
 | 
			
		||||
*vcproj.*.*.user
 | 
			
		||||
*.ncb
 | 
			
		||||
*.sdf
 | 
			
		||||
*.opensdf
 | 
			
		||||
*.vcxproj
 | 
			
		||||
*vcxproj.*
 | 
			
		||||
 | 
			
		||||
# MinGW generated files
 | 
			
		||||
*.Debug
 | 
			
		||||
*.Release
 | 
			
		||||
 | 
			
		||||
# Python byte code
 | 
			
		||||
*.pyc
 | 
			
		||||
 | 
			
		||||
# Binaries
 | 
			
		||||
# --------
 | 
			
		||||
*.dll
 | 
			
		||||
*.exe
 | 
			
		||||
 | 
			
		||||
# This file is used to ignore files which are generated
 | 
			
		||||
# ----------------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
*~
 | 
			
		||||
*.autosave
 | 
			
		||||
*.a
 | 
			
		||||
*.core
 | 
			
		||||
*.moc
 | 
			
		||||
*.o
 | 
			
		||||
*.obj
 | 
			
		||||
*.orig
 | 
			
		||||
*.rej
 | 
			
		||||
*.so
 | 
			
		||||
*.so.*
 | 
			
		||||
*_pch.h.cpp
 | 
			
		||||
*_resource.rc
 | 
			
		||||
*.qm
 | 
			
		||||
.#*
 | 
			
		||||
*.*#
 | 
			
		||||
core
 | 
			
		||||
!core/
 | 
			
		||||
tags
 | 
			
		||||
.DS_Store
 | 
			
		||||
.directory
 | 
			
		||||
*.debug
 | 
			
		||||
Makefile*
 | 
			
		||||
*.prl
 | 
			
		||||
*.app
 | 
			
		||||
moc_*.cpp
 | 
			
		||||
ui_*.h
 | 
			
		||||
qrc_*.cpp
 | 
			
		||||
Thumbs.db
 | 
			
		||||
*.res
 | 
			
		||||
*.rc
 | 
			
		||||
/.qmake.cache
 | 
			
		||||
/.qmake.stash
 | 
			
		||||
 | 
			
		||||
# qtcreator generated files
 | 
			
		||||
*.pro.user*
 | 
			
		||||
 | 
			
		||||
# xemacs temporary files
 | 
			
		||||
*.flc
 | 
			
		||||
 | 
			
		||||
# Vim temporary files
 | 
			
		||||
.*.swp
 | 
			
		||||
 | 
			
		||||
# Visual Studio generated files
 | 
			
		||||
*.ib_pdb_index
 | 
			
		||||
*.idb
 | 
			
		||||
*.ilk
 | 
			
		||||
*.pdb
 | 
			
		||||
*.sln
 | 
			
		||||
*.suo
 | 
			
		||||
*.vcproj
 | 
			
		||||
*vcproj.*.*.user
 | 
			
		||||
*.ncb
 | 
			
		||||
*.sdf
 | 
			
		||||
*.opensdf
 | 
			
		||||
*.vcxproj
 | 
			
		||||
*vcxproj.*
 | 
			
		||||
 | 
			
		||||
# MinGW generated files
 | 
			
		||||
*.Debug
 | 
			
		||||
*.Release
 | 
			
		||||
 | 
			
		||||
# Python byte code
 | 
			
		||||
*.pyc
 | 
			
		||||
 | 
			
		||||
# Binaries
 | 
			
		||||
# --------
 | 
			
		||||
*.dll
 | 
			
		||||
*.exe
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										21
									
								
								LICENSE
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								LICENSE
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,21 @@
 | 
			
		||||
MIT License
 | 
			
		||||
 | 
			
		||||
Copyright (c) 2020 wh201906
 | 
			
		||||
 | 
			
		||||
Permission is hereby granted, free of charge, to any person obtaining a copy
 | 
			
		||||
of this software and associated documentation files (the "Software"), to deal
 | 
			
		||||
in the Software without restriction, including without limitation the rights
 | 
			
		||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 | 
			
		||||
copies of the Software, and to permit persons to whom the Software is
 | 
			
		||||
furnished to do so, subject to the following conditions:
 | 
			
		||||
 | 
			
		||||
The above copyright notice and this permission notice shall be included in all
 | 
			
		||||
copies or substantial portions of the Software.
 | 
			
		||||
 | 
			
		||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | 
			
		||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | 
			
		||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 | 
			
		||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 | 
			
		||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 | 
			
		||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 | 
			
		||||
SOFTWARE.
 | 
			
		||||
							
								
								
									
										22
									
								
								main.cpp
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								main.cpp
									
									
									
									
									
								
							@ -1,11 +1,11 @@
 | 
			
		||||
#include "mainwindow.h"
 | 
			
		||||
 | 
			
		||||
#include <QApplication>
 | 
			
		||||
 | 
			
		||||
int main(int argc, char *argv[])
 | 
			
		||||
{
 | 
			
		||||
    QApplication a(argc, argv);
 | 
			
		||||
    MainWindow w;
 | 
			
		||||
    w.show();
 | 
			
		||||
    return a.exec();
 | 
			
		||||
}
 | 
			
		||||
#include "mainwindow.h"
 | 
			
		||||
 | 
			
		||||
#include <QApplication>
 | 
			
		||||
 | 
			
		||||
int main(int argc, char *argv[])
 | 
			
		||||
{
 | 
			
		||||
    QApplication a(argc, argv);
 | 
			
		||||
    MainWindow w;
 | 
			
		||||
    w.show();
 | 
			
		||||
    return a.exec();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user