From: HOSOKAWA Kenchi <hskwk@users.sourceforge.jp>
Date: Mon, 23 May 2011 20:44:09 +0000 (+0900)
Subject: Merge remote branch 'remotes/psychlopssilverlight/master'
X-Git-Url: http://git.osdn.jp/view?p=psychlops%2Fsilverlight.git;a=commitdiff_plain;h=e816f42793839d5dc3eb9cf933bbcb8e104d9fdb

Merge remote branch 'remotes/psychlopssilverlight/master'

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

e816f42793839d5dc3eb9cf933bbcb8e104d9fdb
diff --cc test4/PsychlopsMain.cs
index fe1a13a,4cfe448..7a79979
--- a/test4/PsychlopsMain.cs
+++ b/test4/PsychlopsMain.cs
@@@ -572,7 -257,7 +572,11 @@@ namespace PsychlopsSilverlightAp
              img2 = new Image(isize * 2, isize * 2);
              img3 = new Image(isize * 2, isize * 2);
  
++<<<<<<< HEAD
 +			var gabor1 = StaticFunctions.NewArray<Figures.ShaderGabor>(100);
++=======
+ 			var gabor1 = StaticFunctions.NewArray<Figures.ShaderGaborAlpha>(100);
++>>>>>>> remotes/psychlopssilverlight/master
  			foreach(var g in gabor1)
  			{
  				g.setSigma(isize / 8).centering().shift(Math.random(300) - 150, Math.random(600) - 300);