notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git subrepo pull (merge) --force deps/libchdr
[pcsx_rearmed.git]
/
deps
/
libchdr
/
.gitrepo
diff --git
a/deps/libchdr/.gitrepo
b/deps/libchdr/.gitrepo
index
3b1c636
..
b49eb49
100644
(file)
--- a/
deps/libchdr/.gitrepo
+++ b/
deps/libchdr/.gitrepo
@@
-6,7
+6,7
@@
[subrepo]
remote = https://github.com/rtissera/libchdr
branch = master
[subrepo]
remote = https://github.com/rtissera/libchdr
branch = master
- commit = 5
4bfb871ccae31903b95a8feb7f2bf7121f304be
- parent =
f9d08a117cd57ce2ce39ca73532505d9c9cfdca5
+ commit = 5
c598c2df3a7717552a76410d79f5af01ff51b1d
+ parent =
e2fb1389dc12376acb84e4993ed3b08760257252
method = merge
cmdver = 0.4.6
method = merge
cmdver = 0.4.6