OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f503817
809beb5
)
Merge branch 'v04' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v04license
author
yasushiito
<yas@pen-chan.jp>
Sat, 30 Jun 2012 03:44:09 +0000
(12:44 +0900)
committer
yasushiito
<yas@pen-chan.jp>
Sat, 30 Jun 2012 03:44:09 +0000
(12:44 +0900)
1
2
spec/models/artist_spec.rb
patch
|
diff1
|
diff2
|
blob
|
history
spec/models/original_picture_spec.rb
patch
|
diff1
|
diff2
|
blob
|
history
spec/models/panel_spec.rb
patch
|
diff1
|
diff2
|
blob
|
history
spec/models/resource_picture_spec.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
spec/models/artist_spec.rb
Simple merge
diff --cc
spec/models/original_picture_spec.rb
Simple merge
diff --cc
spec/models/panel_spec.rb
Simple merge
diff --cc
spec/models/resource_picture_spec.rb
Simple merge
OSDN Git Service
