projects
/
synfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
813c951
26f78d0
)
Merge branch 'genete_static_values'
author
Carlos Lopez
<genetita@gmail.com>
Wed, 1 Sep 2010 15:32:44 +0000
(17:32 +0200)
committer
Carlos Lopez
<genetita@gmail.com>
Wed, 1 Sep 2010 15:32:44 +0000
(17:32 +0200)
1
2
synfig-core/src/modules/lyr_std/import.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
synfig-core/src/modules/lyr_std/import.cpp
Simple merge