|
|
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 |
|
|
|
2503233ced
|
Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop
Conflicts:
.gitignore
|
2013-05-11 21:14:40 +02:00 |
|
|
|
d4b198f29a
|
added java bin directory to .gitignore
|
2013-05-11 19:50:12 +02:00 |
|
|
|
ea003a818c
|
compiled release binary
|
2013-05-11 19:47:14 +02:00 |
|
|
|
70ca62b195
|
change case of project directory
|
2013-03-22 17:58:44 +01:00 |
|
