projects
/
kamaki
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
928c2be
5b879b1
)
Merge branch 'develop' into release-0.7
author
Stavros Sachtouris
<saxtouri@admin.grnet.gr>
Thu, 21 Feb 2013 15:19:58 +0000
(17:19 +0200)
committer
Stavros Sachtouris
<saxtouri@admin.grnet.gr>
Thu, 21 Feb 2013 15:19:58 +0000
(17:19 +0200)
Conflicts:
version
1
2
version
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
version
index
c4a3727
,
eb49d7c
..
9e55365
---
1
/
version
---
2
/
version
+++ b/
version
@@@
-1,1
-1,1
+1,5
@@@
++<<<<<<< HEAD
+0.7rc3
++=======
+ 0.7
++>>>>>>> develop
projects / kamaki / commitdiff