Homedesp's stash

Merge branch 'master' of github.com:NtQuery/Scylla

Authored by pezcode <[email protected]> on Oct 9 2011, 2:18 PM.

Description

Merge branch 'master' of github.com:NtQuery/Scylla

Conflicts:
Scylla/OptionsGui.cpp
Scylla/PickDllGui.cpp
Scylla/WindowDeferrer.cpp

Details

Committed
pezcode <[email protected]>Oct 9 2011, 2:18 PM
Pushed
despawningboneAug 15 2020, 8:55 AM
Parents
rSCYdab7daf2dcde: fixed compiler warnings
rSCYd455e3c0dced: Remove WindowDeferrer
Branches
Unknown
Tags
Unknown

Event Timeline

Merged Changes

CommitAuthorDetailsCommitted
dab7daf2dcdeG36KV
fixed compiler warnings 
Oct 9 2011