Commit Graph

90 Commits

Author SHA1 Message Date
d0b45684c7 Merge remote-tracking branch 'remotes/sound/sound' into develop
Conflicts:
	java/.project
2014-10-13 22:37:59 +01:00
1b8a6bc544 Starting to clean vendor structure 2014-10-13 22:35:09 +01:00
0a9ba6d684 Prepare to remove this branch 2014-10-13 22:34:27 +01:00
22fbc6edc5 changed project names in order for gradle to resolve them correctly 2013-12-07 11:00:25 +00:00
74b42dec10 changed project names in order for gradle to resolve them correctly 2013-12-07 11:00:04 +00:00
4192794e69 Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/mimis into sound
Conflicts:
	java/settings.gradle
2013-12-02 20:45:46 +00:00
82b66ba73e changing project structure 2013-12-02 20:43:28 +00:00
e0ecdc998c Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/mimis into sound
Conflicts:
	.gitignore
2013-12-02 20:41:34 +00:00
5b0d8bd977 commit before merging mimis/base 2013-12-02 20:38:19 +00:00
1b005c69f5 modified paths in copy.bat post-build scripts for libraries 2013-08-05 12:52:18 +02:00
1554117f99 migrated sound branch to gradle project structure 2013-07-31 12:09:09 +02:00
9094efb80b Merge remote-tracking branch 'sound/develop' into sound 2013-07-31 11:05:39 +02:00
01d5df070b modified project 2013-07-31 10:20:09 +02:00
cb7fcf97b9 Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop 2013-07-30 10:43:03 +02:00
bde4947eba modified project file 2013-07-30 10:40:47 +02:00
0ffea24581 Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop 2013-07-21 11:04:30 +02:00
b04f26315d Merge branch 'develop' into develop-wiiusej
Conflicts:
	cpp/wiiusej/Debug/wiiusej.dll
2013-07-20 16:38:32 +02:00
205c1e6e7c modified project settings 2013-07-20 16:37:20 +02:00
cb7fce3536 fixed merge conflicts 2013-07-20 16:27:28 +02:00
e42f5ff3e0 Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop
Conflicts:
	.gitignore
	cpp/mimis/wiiuse.dll
2013-07-20 16:26:45 +02:00
625275e5c9 modified project settings 2013-07-20 16:22:54 +02:00
164a8354cc Merge branch 'develop-mimis' into develop 2013-07-20 16:19:32 +02:00
b24cf725bf modified project settings 2013-07-20 16:18:53 +02:00
ebb9a9098f modified project settings 2013-07-20 16:16:00 +02:00
3de0693b1c Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop 2013-07-20 16:14:52 +02:00
858c67aab2 Merge branch 'develop-wiiuse' into develop 2013-07-20 16:14:38 +02:00
7c34f87185 recompiled wiiuse 2013-07-20 16:13:58 +02:00
7bb42d70d9 Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop
Conflicts:
	.gitignore
2013-07-20 16:12:43 +02:00
3b98295c75 Merge branch 'develop-wiipair' into develop
Conflicts:
	.gitignore
2013-07-20 16:11:33 +02:00
0ea32724c3 removed .settings directory from repository 2013-07-20 16:08:15 +02:00
61d279d878 Merge branch 'develop-wiiuse' into develop
Conflicts:
	cpp/wiiusej/lib/wiiuse.lib
2013-07-20 15:52:28 +02:00
e8f53cbce0 edit project files 2013-07-20 15:51:29 +02:00
28f1e2d994 Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop 2013-05-11 21:17:33 +02:00
1e8c362f01 Merge branch 'develop-wiipair' into develop 2013-05-11 21:07:02 +02:00
0c6aa57c9a Merge branch 'develop-wiiuse' into develop
Conflicts:
	cpp/wiiscan/lib/wiiuse.lib
	cpp/wiiusej/lib/wiiuse.lib
2013-05-11 21:04:02 +02:00
2115eb9c86 compiled wiiusej 2013-05-11 19:49:13 +02:00
ea003a818c compiled release binary 2013-05-11 19:47:14 +02:00
b4f01111ab renamed package Pipes to Pipe 2013-03-22 19:51:49 +01:00
7ec5710650 added copy.bat files 2013-03-22 19:46:53 +01:00
c5fdf90974 split in java and c++ parts 2013-03-22 19:33:05 +01:00
4897fa7024 Merge branch 'develop-wiipair' into develop
Conflicts:
	cpp/wiipair/.settings/org.eclipse.cdt.managedbuilder.core.prefs
2013-03-22 18:00:33 +01:00
9c0dc8e3f0 change case of project directory 2013-03-22 17:57:36 +01:00
eef466bfc2 Merge branch 'develop-wiipair' into develop 2013-03-22 17:06:09 +01:00
b0bc785fa0 removed .settings directory 2013-03-22 17:03:08 +01:00
58c24d13b6 cleaned project directory 2013-03-22 17:02:21 +01:00
5edc60df02 linked wiiusej against new wiiuse.lib 2013-03-22 16:49:54 +01:00
219a729045 cleaned project directory 2013-03-22 16:48:42 +01:00
88c9c07ca4 changed mimis path in post-build scripts 2013-03-22 16:46:28 +01:00
d4ba0f24ee Created wiipair (http://www.richlynch.com/code/wiipair) project.
Compiles, but crashes on run.
2013-03-22 08:32:58 +01:00
af6dcc4a78 - 2012-05-28 21:38:35 +02:00