OSDN Git Service

Merge remote-tracking branch 'upstream/master' into pixmap-triangle
authorJames Jurach <james.jurach@gmail.com>
Sat, 18 May 2013 02:54:34 +0000 (21:54 -0500)
committerJames Jurach <james.jurach@gmail.com>
Sat, 18 May 2013 02:54:34 +0000 (21:54 -0500)
commitc50a67b8b5cbfab5cc36e31b29233d64b8c760c1
tree2ad4d4daa75cd5a56d67e26ecd3c7340190cc386
parentad2362f5f37c81440b9fed0874c94cf310a312a8
parent9fe25d5e2795511d512e487d0ff010bc00b312a5
Merge remote-tracking branch 'upstream/master' into pixmap-triangle