|
|
0a9ba6d684
|
Prepare to remove this branch
|
2014-10-13 22:34:27 +01:00 |
|
|
|
d903be9897
|
cleaned up old imported/decompiled files, basic shoutcast functionality
restored, disabled meta for streaming because of inconsistency issues.
|
2013-12-15 21:31:11 +00: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 |
|
|
|
9d87d3032f
|
Merge remote-tracking branch 'origin/develop' into sound
|
2013-07-31 11:28:36 +02:00 |
|
|
|
d7a7b179f3
|
changed last occurrences of log4j to slf4j
|
2013-07-31 11:27:57 +02:00 |
|
|
|
9094efb80b
|
Merge remote-tracking branch 'sound/develop' into sound
|
2013-07-31 11:05:39 +02:00 |
|
|
|
56f9715c2a
|
Merge branch 'develop-java' into develop
|
2013-07-31 10:20:38 +02:00 |
|
|
|
01d5df070b
|
modified project
|
2013-07-31 10:20:09 +02:00 |
|
|
|
2f4399c4cd
|
* removed old (ant and launch4j) build files
* switched from log4j to slf4j
|
2013-07-30 15:22:21 +02:00 |
|
|
|
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 |
|
