Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								d5e757c7b0
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/x64dbg/x64dbg
							
							
							
							
							
							
							
							Conflicts:
	src/dbg/capstone_wrapper.cpp
	src/dbg/capstone_wrapper.h
	src/dbg/debugger.cpp
	src/dbg/instruction.cpp
	src/dbg/memory.cpp
	src/gui/Src/BasicView/Disassembly.cpp
	src/gui/Src/BasicView/Disassembly.h
	src/gui/Src/Bridge/Bridge.cpp
	src/gui/Src/Disassembler/BeaTokenizer.cpp
	src/gui/Src/Disassembler/BeaTokenizer.h
	src/gui/Src/Disassembler/QBeaEngine.cpp
	src/gui/Src/Disassembler/QBeaEngine.h
	src/gui/Src/Gui/AppearanceDialog.cpp
	src/gui/Src/Gui/CPUDisassembly.cpp
	src/gui/Src/Gui/CPUSideBar.cpp
	src/gui/Src/Gui/SettingsDialog.ui
	src/gui/Src/ThirdPartyLibs/BeaEngine/BeaEngine.h
	src/gui/Src/ThirdPartyLibs/BeaEngine/basic_types.h
	src/gui/Src/ThirdPartyLibs/BeaEngine/export.h
	src/gui/Src/ThirdPartyLibs/BeaEngine/libBeaEngine.a
	src/gui/Src/ThirdPartyLibs/BeaEngine/libBeaEngine_64.a
	src/gui/Src/ThirdPartyLibs/BeaEngine/macros.h
	src/gui/Src/Utils/Configuration.cpp
	src/gui/Src/main.cpp
	src/gui/x64dbg.pro 
							
						 | 
						
							2015-11-06 23:21:13 -05:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								e19196781c
								
							
						 | 
						
							
							
								
								DBG: MemPatch/assemble dialog now show errors when unable to write memory
							
							
							
							
							
						 | 
						
							2015-10-19 20:11:27 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								4ea160e709
								
							
						 | 
						
							
							
								
								GUI: Possibly fix #406, #401, #243 (NEEDS CHECKING)
							
							
							
							
							
							
							
							This may have unintended side effects. 
							
						 | 
						
							2015-10-18 23:53:43 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								f7fec2d7dc
								
							
						 | 
						
							
							
								
								DBG: Fix some nice undefined behavior in RefFind
							
							
							
							
							
						 | 
						
							2015-10-18 18:17:26 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								8edc982597
								
							
						 | 
						
							
							
								
								DBG: Auto-formatting
							
							
							
							
							
						 | 
						
							2015-10-18 13:48:44 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								0f41be54d9
								
							
						 | 
						
							
							
								
								GUI: Include capstone files
							
							
							
							
							
						 | 
						
							2015-10-18 01:31:03 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								c00ae0bb1b
								
							
						 | 
						
							
							
								
								GUI: Fix debugbreak when RegistersView::paintEvent is called
							
							
							
							
							
						 | 
						
							2015-10-17 23:34:23 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								c0a9ec5a50
								
							
						 | 
						
							
							
								
								DBG: Add asserts in a bunch of places
							
							
							
							
							
						 | 
						
							2015-10-17 23:32:52 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								394cae37eb
								
							
						 | 
						
							
							
								
								EXE: Fix #385
							
							
							
							
							
						 | 
						
							2015-10-17 22:38:49 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								c0a6040ded
								
							
						 | 
						
							
							
								
								GUI: Fix #409
							
							
							
							
							
						 | 
						
							2015-10-17 21:12:27 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								8ee7f7eaad
								
							
						 | 
						
							
							
								
								GUI/PROJECT: Fixing various errors
							
							
							
							
							
						 | 
						
							2015-10-17 20:15:21 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								33dea5d705
								
							
						 | 
						
							
							
								
								GUI: Replacing uint_t and int_t
							
							
							
							
							
						 | 
						
							2015-10-17 20:00:15 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								e61921d449
								
							
						 | 
						
							
							
								
								PROJECT: Update most batch scripts
							
							
							
							
							
						 | 
						
							2015-10-17 18:58:15 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								772167b29e
								
							
						 | 
						
							
							
								
								PROJECT: Fixing .gitignore
							
							
							
							
							
						 | 
						
							2015-10-17 18:01:01 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								5c6a2efdf6
								
							
						 | 
						
							
							
								
								GUI: Update QMake file
							
							
							
							
							
						 | 
						
							2015-10-17 17:53:53 -04:00 | 
						
					
				
					
						
							
							
								 
								Nukem
							
						 | 
						
							
							
							
							
							
								
							
							
								2297a92935
								
							
						 | 
						
							
							
								
								PROJECT: RESTRUCTURE
							
							
							
							
							
						 | 
						
							2015-10-17 16:35:38 -04:00 |