marius david
|
211711c326
|
Merge commit '14d40552e5' into torzu-merging
|
2025-01-01 20:11:24 +01:00 |
|
marius david
|
c8a2a21bab
|
Ignore irrelevant changes
Merge commit '9efce71072' into torzu-merging
|
2025-01-01 20:11:10 +01:00 |
|
marius david
|
ac1191e4a1
|
Merge commit '85dc40ad23' into torzu-merging
|
2025-01-01 20:08:44 +01:00 |
|
marius david
|
cc7894ee42
|
Ignore irrelevant commit
Merge commit 'f45341ef55' into torzu-merging
|
2025-01-01 20:08:00 +01:00 |
|
marius david
|
d910d8fd85
|
Merge commit '6d2368b07b' into torzu-merging
|
2025-01-01 20:01:23 +01:00 |
|
marius david
|
de1134c772
|
Merge commit '783e8952e0' into torzu-merging
|
2025-01-01 19:48:54 +01:00 |
|
marius david
|
dd50f41702
|
Discard irrelevant changes
Merge commit '15470284cf' into torzu-merging
|
2025-01-01 19:47:47 +01:00 |
|
marius david
|
1cea38e69c
|
Merge commit '1a0d98f984' into torzu-merging
|
2025-01-01 19:46:48 +01:00 |
|
marius david
|
3fbb8174e2
|
Discard irrelevant commit
Merge commit 'eefc75732f' into torzu-merging
|
2025-01-01 19:46:33 +01:00 |
|
marius david
|
4d149b06b1
|
Fix compilation related to the profile image selection
|
2025-01-01 19:44:54 +01:00 |
|
marius david
|
9de0769002
|
Merge commit 'd6ca4f11c1' into torzu-merging
|
2025-01-01 19:32:14 +01:00 |
|
marius david
|
ab0b473a8e
|
Merge commit 'ab4c093976' into torzu-merging
|
2025-01-01 19:30:37 +01:00 |
|
marius david
|
fdb8f6b2fa
|
Other irrelevant changes
Merge commit 'ec2e6dfdac' into torzu-merging
|
2025-01-01 19:29:53 +01:00 |
|
marius david
|
eb37e57ffd
|
Merge commit '587825f60a' into torzu-merging
|
2025-01-01 19:27:12 +01:00 |
|
marius david
|
135ff9dc36
|
Disregard another commit, might be of interest in the future
Merge commit '0719273fed' into torzu-merging
|
2025-01-01 19:26:51 +01:00 |
|
marius david
|
b50eff12ec
|
Disregard irrelevant changes
Merge commit '60a8bf844f' into torzu-merging
|
2025-01-01 19:26:34 +01:00 |
|
marius david
|
6d8208478e
|
Merge commit 'cd40133aa4' into torzu-merging
|
2025-01-01 19:23:04 +01:00 |
|
marius david
|
6c70ff7f00
|
Disregard irrelevant changes
Merge commit '1b51d49e16' into torzu-merging
|
2025-01-01 19:22:03 +01:00 |
|
marius david
|
18220cb4d4
|
Merge commit 'a1c2940b31' into torzu-merging
|
2025-01-01 19:19:00 +01:00 |
|
marius david
|
1ee0c3f13d
|
Disregard torzu EA changes
Merge commit 'a41955cc58' into torzu-merging
|
2025-01-01 18:44:20 +01:00 |
|
marius david
|
9e6bb064fb
|
Disregard irrelevant change
Merge commit 'ede46f9bd2' into torzu-merging
|
2025-01-01 18:43:20 +01:00 |
|
marius david
|
cb8353bd5b
|
Merge commit '8935e96db9' into torzu-merging
|
2025-01-01 18:41:53 +01:00 |
|
marius david
|
d7d1a29bc3
|
Discard other relevant changes
Merge commit '7e27e6476d' into torzu-merging
|
2025-01-01 18:41:14 +01:00 |
|
marius david
|
f3eae47aa2
|
Merge commit '93c9c33b9f' into torzu-merging
|
2025-01-01 18:39:00 +01:00 |
|
marius david
|
382d949b53
|
Merge commit 'e8f43b7078' into torzu-merging
|
2025-01-01 18:38:52 +01:00 |
|
marius david
|
a215a76eda
|
Merge commit 'a9f6342ea4' into torzu-merging
|
2025-01-01 18:22:38 +01:00 |
|
marius david
|
803aa53b61
|
Disregard irrelevant changes
Merge commit 'b1895cf7ae' into torzu-merging
|
2025-01-01 18:22:06 +01:00 |
|
marius david
|
7b0c1a84d8
|
Merge commit 'c432641245' into torzu-merging
|
2025-01-01 18:21:33 +01:00 |
|
marius david
|
6a977eabf6
|
Disregard irrelevant changes
Merge commit 'f064967e32' into torzu-merging
|
2025-01-01 18:21:19 +01:00 |
|
marius david
|
ee75e0e457
|
Merge commit '66ae161cf8' into torzu-merging
|
2025-01-01 18:19:52 +01:00 |
|
marius david
|
09131eb487
|
Disregard irrelevant change
Merge commit '63ea3f52f3' into torzu-merging
|
2025-01-01 18:19:32 +01:00 |
|
marius david
|
ad61f5f432
|
Merge commit '01d9c403f2' into torzu-merging
|
2025-01-01 18:16:47 +01:00 |
|
marius david
|
ae0f3bd6ff
|
Merge commit '505dbf93d0' into torzu-merging
|
2025-01-01 18:12:46 +01:00 |
|
marius david
|
521e4dae5a
|
Merge commit 'a96e97ea13' into torzu-merging
|
2025-01-01 18:11:50 +01:00 |
|
marius david
|
5af1c20c94
|
Disregard another irrelevant change
Merge commit '74df9ec3a7' into torzu-merging
|
2025-01-01 18:06:34 +01:00 |
|
marius david
|
f9ade37a82
|
Discard other irrelevant changes
Merge commit '2184968eb4' into torzu-merging
|
2025-01-01 18:05:35 +01:00 |
|
marius david
|
a09f75dec3
|
Merge commit '2ad113f22c' into torzu-merging
|
2025-01-01 18:00:24 +01:00 |
|
marius david
|
70f89b3eb8
|
Disregard readme change
Merge commit 'd37c170663' into torzu-merging
|
2025-01-01 18:00:09 +01:00 |
|
marius david
|
e1a463ba81
|
Merge commit 'e0e2a4c0c5' into torzu-merging
|
2025-01-01 17:57:45 +01:00 |
|
marius david
|
338e68b7bb
|
Discard other irrelevant torzu change (or too hard to merge, for seperate addition)
Merge commit '178db2388c' into torzu-merging
|
2025-01-01 17:42:51 +01:00 |
|
marius david
|
a636fa46a4
|
Not merge already used change
Merge commit '69dd658a0b' into torzu-merging
|
2025-01-01 16:53:22 +01:00 |
|
marius david
|
7dd8ff60c2
|
Merge commit 'dfa2204aa2' into torzu-merging
|
2025-01-01 16:49:02 +01:00 |
|
marius david
|
e5fdd1574f
|
Do not use a bunch of torzu’s stuff
Merge commit '53ad973d6a' into torzu-merging
|
2025-01-01 16:48:42 +01:00 |
|
marius david
|
9a91dd98a0
|
Merge commit '69a4d26b1e' into torzu-merging
|
2025-01-01 16:45:08 +01:00 |
|
marius david
|
02d3b6001c
|
Do not use a certain amount of irrelevant-to-suyu work
Merge commit '5bc8aaa78b' into torzu-merging
|
2025-01-01 16:43:40 +01:00 |
|
marius david
|
f08713138a
|
Do not use those minicoro change
Merge commit 'f2592ff593' into torzu-merging
|
2025-01-01 15:49:46 +01:00 |
|
marius david
|
97c989f787
|
Merge commit '3857ff1aa8' into torzu-merging
|
2025-01-01 15:29:05 +01:00 |
|
marius david
|
2bbc2437eb
|
Merge some changes related to friends
Merge commit 'd0ef57274a' into torzu-merging
|
2025-01-01 15:10:17 +01:00 |
|
marius david
|
4197305117
|
Prohib running main menu when another software is already being emulated
Merge commit 'a5a11e03a1' into torzu-merging
|
2025-01-01 15:04:12 +01:00 |
|
marius david
|
5fafae3783
|
Either already integrated or torzu-specific change
Merge commit '4c25cbae7b' into torzu-merging
|
2025-01-01 14:01:02 +01:00 |
|