projects
/
profile
/
ivi
/
clutter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2628ba7
e7720c4
)
Merge branch 'master' into msvc-support-master
author
Chun-wei Fan
<fanchunwei@src.gnome.org>
Mon, 14 Nov 2011 14:57:50 +0000
(22:57 +0800)
committer
Chun-wei Fan
<fanchunwei@src.gnome.org>
Mon, 14 Nov 2011 14:57:50 +0000
(22:57 +0800)
1
2
tests/conform/test-cogl-materials.c
patch
|
diff1
|
diff2
|
blob
|
history
tests/conform/test-cogl-pixel-buffer.c
patch
|
diff1
|
diff2
|
blob
|
history
tests/micro-bench/test-picking.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tests/conform/test-cogl-materials.c
Simple merge
diff --cc
tests/conform/test-cogl-pixel-buffer.c
Simple merge
diff --cc
tests/micro-bench/test-picking.c
Simple merge