Merge branch 'develop' into develop-wiiusej

Conflicts:
	cpp/wiiusej/Debug/wiiusej.dll
This commit is contained in:
2013-07-20 16:38:32 +02:00
3 changed files with 7 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>WiiuseJ</name>
<name>WiiuseJ library</name>
<comment></comment>
<projects>
</projects>