summaryrefslogtreecommitdiffstatshomepage
path: root/hlsl
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2015-05-30 14:57:13 +0200
committer ImJezze <jezze@gmx.net>2015-05-30 14:57:13 +0200
commitd1d9dfc2d4be85cee8c8c990950d72ee6df78e5e (patch)
tree495d4e5a066ee13be131f08437732b3588d43a42 /hlsl
parentfe71f92dd24270ae7c5621166b096c665ca0e4f5 (diff)
parent51709eef04f9f0c6d621447c568e170927fa9472 (diff)
Merge pull request #4 from mamedev/master
Sync to base master
Diffstat (limited to 'hlsl')
-rw-r--r--hlsl/bloom.fx2
-rw-r--r--hlsl/downsample.fx2
-rw-r--r--hlsl/focus.fx2
-rw-r--r--hlsl/post.fx2
-rw-r--r--hlsl/simple.fx2
5 files changed, 5 insertions, 5 deletions
diff --git a/hlsl/bloom.fx b/hlsl/bloom.fx
index c01b3521442..f6a0c9d57d1 100644
--- a/hlsl/bloom.fx
+++ b/hlsl/bloom.fx
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Ryan Holtz,ImJezze
//-----------------------------------------------------------------------------
// Effect File Variables
diff --git a/hlsl/downsample.fx b/hlsl/downsample.fx
index 8d6eaa60c74..b7579fc24ed 100644
--- a/hlsl/downsample.fx
+++ b/hlsl/downsample.fx
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Ryan Holtz,ImJezze
//-----------------------------------------------------------------------------
// Effect File Variables
diff --git a/hlsl/focus.fx b/hlsl/focus.fx
index f19a8a01eae..a7c6c7ae8f2 100644
--- a/hlsl/focus.fx
+++ b/hlsl/focus.fx
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Ryan Holtz,ImJezze
//-----------------------------------------------------------------------------
// Effect File Variables
diff --git a/hlsl/post.fx b/hlsl/post.fx
index 54bc0b6d6bb..78e4b648ddf 100644
--- a/hlsl/post.fx
+++ b/hlsl/post.fx
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Ryan Holtz,ImJezze
//-----------------------------------------------------------------------------
// Scanline & Shadowmask Effect
diff --git a/hlsl/simple.fx b/hlsl/simple.fx
index bb58f37469f..e26ca3fbb36 100644
--- a/hlsl/simple.fx
+++ b/hlsl/simple.fx
@@ -1,4 +1,4 @@
-// license:GPL-2.0+
+// license:BSD-3-Clause
// copyright-holders:Ryan Holtz,ImJezze
//-----------------------------------------------------------------------------
// Effect File Variables