projects
/
xemelios
/
xemelios-rsa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2fcbe39
72b1bd9
)
Merge branch 'develop'
master
author
RENIER Paul
<paul.renier@axyus.com>
Thu, 12 Dec 2013 14:04:16 +0000
(15:04 +0100)
committer
RENIER Paul
<paul.renier@axyus.com>
Thu, 12 Dec 2013 14:04:16 +0000
(15:04 +0100)
Conflicts:
.gitignore
1
2
.gitignore
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
.gitignore
index
2c85a9c
,
914e7fa
..
53ecad4
---
1
/
.gitignore
---
2
/
.gitignore
+++ b/
.gitignore
@@@
-1,4
-1,5
+1,5
@@@
build
--
- .pmd
+.pmd
+ .models
+ .classpath
+ .settings