Commit Graph

398 Commits

Author SHA1 Message Date
86aa971d96 Merge remote-tracking branch 'origin/vendor' into develop 2013-07-30 14:46:45 +02:00
a98c646196 removed some packages that are available via the maven repository 2013-07-30 14:45:48 +02:00
62f77fd4a0 migration to gradle, splitted wiiusej, wiigee and itunescontroller into subprojects 2013-07-30 14:44:23 +02:00
d51714d565 migration to gradle project structure, moving files first 2013-07-30 14:43:32 +02:00
d13215e2b3 Merge branch 'develop-java' into develop 2013-07-30 10:45:56 +02:00
a918758ee3 * added IntervalWorker
* added CustomAppender for logging
* minor modifications
2013-07-30 10:45:27 +02:00
cb7fcf97b9 Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop 2013-07-30 10:43:03 +02:00
237fb2b912 Merge branch 'develop-mimis' into develop 2013-07-30 10:42:35 +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
b2cdfc90f3 Merge branch 'develop-wiiusej' into develop 2013-07-21 11:04:11 +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
23634cf00e Merge branch 'develop' into develop-java 2013-07-20 16:32:57 +02:00
717177f2ef Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop 2013-07-20 16:31:14 +02:00
ff27ed7cda Merge branch 'develop-java' into develop 2013-07-20 16:30:18 +02:00
51461f87b2 build jar packages 2013-07-20 16:29:05 +02:00
6371f12c7e Merge branch 'develop' into develop-mimis 2013-07-20 16:28:36 +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
4e677fe757 Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop 2013-07-20 15:54:11 +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
b12c4cff70 Merge branch 'develop-java' into develop 2013-05-22 21:16:24 +02:00
ff4938a323 use java.util.ServiceLoader to load applications and devices more or
less dynamically.
2013-05-22 21:15:21 +02:00
9d3eabb91c Merge branch 'develop' into develop-java 2013-05-22 14:46:56 +02:00
eeda858f97 Merge branch 'vendor' into develop 2013-05-22 14:42:26 +02:00
9e396d2988 added Apache Commons Collections library. 2013-05-22 14:35:57 +02:00
3d06b0731d Merge branch 'develop-wiiuse' into develop
Conflicts:
	.gitignore
2013-05-11 21:18:00 +02:00
28f1e2d994 Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop 2013-05-11 21:17:33 +02:00
40983d480a edited .gitignore 2013-05-11 21:17:18 +02:00
2503233ced Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop
Conflicts:
	.gitignore
2013-05-11 21:14:40 +02:00
c9d82ef8e8 Merge branch 'develop-java' into develop 2013-05-11 21:10:14 +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
d4b198f29a added java bin directory to .gitignore 2013-05-11 19:50:12 +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
4c4b71df84 compiled jar executables 2013-05-11 19:45:03 +02:00
b4f01111ab renamed package Pipes to Pipe 2013-03-22 19:51:49 +01:00