Merge branch 'develop' into develop-wiiusej
Conflicts: cpp/wiiusej/Debug/wiiusej.dll
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>WiiuseJ</name>
|
||||
<name>WiiuseJ library</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
|
||||
Reference in New Issue
Block a user