]> git.sesse.net Git - freerainbowtables/commit
Merge branch 'master' of git@gitorious.org:freerainbowtables-applications/freerainbow...
authorJames Nobis <quel@quelrod.net>
Sun, 7 Nov 2010 01:19:23 +0000 (20:19 -0500)
committerJames Nobis <quel@quelrod.net>
Sun, 7 Nov 2010 01:19:23 +0000 (20:19 -0500)
commit86bbf0fd5ba4e07d3279b4179fd8fc808198eaae
treefb632b3560038b0278710a10e07c0db2cffa7a6a
parent0fb676244827a448dc60118d6558c4a4e346ffee
parent3d42602c1f746b5768f0e6c9d22884a9806eadc0
Merge branch 'master' of git@gitorious.org:freerainbowtables-applications/freerainbowtables

Conflicts:

Client Applications/rcracki_mt/ChainWalkContext.cpp
Client Applications/rcracki_mt/ChainWalkContext.h
Client Applications/rcracki_mt/CrackEngine.cpp
Client Applications/rcracki_mt/HashAlgorithm.cpp
Client Applications/rcracki_mt/HashRoutine.cpp
Client Applications/rcracki_mt/HashSet.cpp
Client Applications/rcracki_mt/MemoryPool.cpp
Client Applications/rcracki_mt/MemoryPool.h
Client Applications/rcracki_mt/Public.cpp
Client Applications/rcracki_mt/Public.h
Client Applications/rcracki_mt/RTI2Reader.cpp
Client Applications/rcracki_mt/RTI2Reader.h
Client Applications/rcracki_mt/RainbowCrack.cpp
Client Applications/rcracki_mt/lm2ntlm.cpp
Client Applications/rcracki_mt/md4.cpp
Client Applications/rcracki_mt/rcrackiThread.cpp
Client Applications/rcracki_mt/sha1.cpp
Client Applications/rti2rto/rti2rto.cpp
Common/rt api/BaseRTReader.h
Common/rt api/MemoryPool.cpp
Common/rt api/RTI2Reader.cpp
Common/rt api/RTIReader.cpp

merging with PB's changes
UINT4 -> uint32 changes
misc fixes for rti2
misc fixes for long 64/32 compat
21 files changed:
Client Applications/converti2/Makefile
Client Applications/converti2/Public.cpp
Client Applications/converti2/Public.h
Client Applications/converti2/converti2.cpp
Client Applications/converti2/converti2.suo
Client Applications/rcracki_mt/BaseRTReader.h
Client Applications/rcracki_mt/ChainWalkSet.cpp
Client Applications/rcracki_mt/CrackEngine.cpp
Client Applications/rcracki_mt/HashAlgorithm.cpp
Client Applications/rcracki_mt/MemoryPool.cpp
Client Applications/rcracki_mt/Public.cpp
Client Applications/rcracki_mt/RTI2Reader.cpp
Client Applications/rcracki_mt/RTI2Reader.h
Client Applications/rti2rto/Makefile
Client Applications/rti2rto/rti2rto.cpp
Common/rt api/BaseRTReader.h
Common/rt api/MemoryPool.cpp
Common/rt api/Public.cpp
Common/rt api/RTI2Reader.cpp
Common/rt api/RTI2Reader.h
Common/rt api/RTIReader.cpp