OSDN Git Service

Merge remote branch 'remotes/psychlopssilverlight/master'
authorHOSOKAWA Kenchi <hskwk@users.sourceforge.jp>
Mon, 23 May 2011 20:44:09 +0000 (05:44 +0900)
committerHOSOKAWA Kenchi <hskwk@users.sourceforge.jp>
Mon, 23 May 2011 20:44:09 +0000 (05:44 +0900)
commite816f42793839d5dc3eb9cf933bbcb8e104d9fdb
tree7b7b8b65c0a62bb4a166c0cdb136a2fa03e40d2a
parent39e414403e124f21d684b744254e74539caceeb1
parent0518057c18438b6b749a3845c8eeeb5402ee893b
Merge remote branch 'remotes/psychlopssilverlight/master'

Conflicts:
dev4/Shader/GaborAlpha.ps
test4/PsychlopsMain.cs
test4/PsychlopsMain.cs