1
0
Fork 0
Commit Graph

6 Commits

Author SHA1 Message Date
mrexodia dc16750418 DBG+GUI: dumpAtN signal (in anticipation of the multiple dump windows issue #300) 2015-11-25 23:43:41 +01:00
mrexodia 1731e1dee5 PROJECT: fixed line endings (hopefully for good now) 2015-11-24 01:50:17 +01:00
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 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 2297a92935 PROJECT: RESTRUCTURE 2015-10-17 16:35:38 -04:00