|
0da86e7d9d
|
Fixed merge conflicts
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@263 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2012-04-07 14:57:17 +00:00 |
|
|
0b3f7802d7
|
Merge branch 'develop' of github.com:Amab/SWADroid into develop
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@236 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2012-02-01 23:45:01 +00:00 |
|
|
edebd5d2f4
|
Added new stuff
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@202 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:27:47 +00:00 |
|
|
ba073bf870
|
Bumped version
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@115 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:09:41 +00:00 |
|
|
1747a94e8a
|
Added missing directories
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@65 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:05:06 +00:00 |
|
|
40cca8eb3d
|
Removed SWADroidTest
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@63 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:04:42 +00:00 |
|
|
db24839935
|
Added SWADroidTest project
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@60 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:04:25 +00:00 |
|
|
a6114d1dd8
|
Removed assets directory
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@29 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:01:35 +00:00 |
|
|
1751f4c55f
|
Removed unused stuff
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@25 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:01:16 +00:00 |
|
|
249d7b350a
|
Added forgotten directory gen. Updated .gitignore
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@11 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:00:19 +00:00 |
|
|
10eb075e15
|
Switched IDE from Netbeans to Eclipse. Updated .gitignore
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@10 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:00:13 +00:00 |
|
|
953a07ded0
|
Added .gitignore file
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@9 5bc14d19-1e4b-4ba2-aa50-860af135f48c
|
2011-11-22 22:00:06 +00:00 |
|