<feed xmlns='http://www.w3.org/2005/Atom'>
<title>dolphin/Data/Sys/Wii, branch stable</title>
<subtitle>GameCube and Wii emulator</subtitle>
<link rel='alternate' type='text/html' href='https://git.dog6.net/dolphin/'/>
<entry>
<title>Move global User/Wii to Sys/Wii</title>
<updated>2013-09-14T04:08:30+00:00</updated>
<author>
<name>Pierre Bourdon</name>
<email>delroth@gmail.com</email>
</author>
<published>2013-09-12T01:32:03+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/dolphin/commit/?id=c3eec379df65ebedfbfce614dee8517c149da0a2'/>
<id>c3eec379df65ebedfbfce614dee8517c149da0a2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into wii-network</title>
<updated>2013-01-01T10:28:46+00:00</updated>
<author>
<name>Matthew Parlane</name>
<email>parlane@gmail.com</email>
</author>
<published>2013-01-01T10:28:46+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/dolphin/commit/?id=e0c9a1fd09b9be953bf0ae41b9014485e750b07e'/>
<id>e0c9a1fd09b9be953bf0ae41b9014485e750b07e</id>
<content type='text'>
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Core/CMakeLists.txt
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
</pre>
</div>
</content>
</entry>
<entry>
<title>Adds the Wii Korean settings file. It was handled in the wii-network branch in rev c42a6f156e2c. Master handles the settings files differently. Until wii-network merges in to master, this closes issue 5642.</title>
<updated>2012-12-14T17:37:26+00:00</updated>
<author>
<name>Ryan Houdek</name>
<email>Sonicadvance1@gmail.com</email>
</author>
<published>2012-12-14T17:37:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/dolphin/commit/?id=532fdada966c2e374216f162223c1059f16e1d2d'/>
<id>532fdada966c2e374216f162223c1059f16e1d2d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>No longer need settings files.</title>
<updated>2012-01-31T04:03:04+00:00</updated>
<author>
<name>Matthew Parlane</name>
<email>parlane@gmail.com</email>
</author>
<published>2012-01-31T04:03:04+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/dolphin/commit/?id=53b624c3818f496804f595cafadfbb835d72d042'/>
<id>53b624c3818f496804f595cafadfbb835d72d042</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>added files and svn ignore settings to the new file structure</title>
<updated>2008-11-04T21:20:12+00:00</updated>
<author>
<name>Shawn Hoffman</name>
<email>godisgovernment@gmail.com</email>
</author>
<published>2008-11-04T21:20:12+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/dolphin/commit/?id=ffe1a671ead8b21d20903f15104e9414530eb248'/>
<id>ffe1a671ead8b21d20903f15104e9414530eb248</id>
<content type='text'>
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1069 8ced0084-cf51-0410-be5f-012b33b47a6e
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1069 8ced0084-cf51-0410-be5f-012b33b47a6e
</pre>
</div>
</content>
</entry>
</feed>
