archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 23:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix rebase conflicts

Browse source
This commit is contained in:
Megamouse 2020-12-22 00:16:09 +01:00
parent 36189b8c3b
commit 7c7af2e102
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Crypto/ec.cpp
View file

@ -1,4 +1,4 @@
// Copyright 2007,2008,2010 Segher Boessenkool <segher@kernel.crashing.org> // Copyright 2007,2008,2010 Segher Boessenkool <segher@kernel.crashing.org>
// Licensed under the terms of the GNU GPL, version 2 // Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

5
rpcs3/Crypto/unpkg.h
View file

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "Loader/PSF.h" #include "Loader/PSF.h"
#include "util/endian.hpp"
#include "util/types.hpp"
#include "Utilities/File.h"
#include <sstream> #include <sstream>
#include <iomanip> #include <iomanip>

2
rpcs3/Crypto/utils.cpp
View file

@ -1,4 +1,4 @@
// Copyright (C) 2014 Hykem <hykem@hotmail.com> // Copyright (C) 2014 Hykem <hykem@hotmail.com>
// Licensed under the terms of the GNU GPL, version 3 // Licensed under the terms of the GNU GPL, version 3
// http://www.gnu.org/licenses/gpl-3.0.txt // http://www.gnu.org/licenses/gpl-3.0.txt