summaryrefslogtreecommitdiff
path: root/src/resampler/resampler.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
commit981f6984c2c0f87d54a9c90f4518c69c9ef02ae0 (patch)
tree757bd699a23c1fad61e60700265a25feb1a3042c /src/resampler/resampler.cpp
parentcbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf (diff)
parent77bf649fb4482c86ac1fd9b3233f062b53226007 (diff)
downloadpowder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.zip
powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.tar.gz
Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/resampler/resampler.cpp')
-rw-r--r--src/resampler/resampler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/resampler/resampler.cpp b/src/resampler/resampler.cpp
index ee3c0dc..9c20f25 100644
--- a/src/resampler/resampler.cpp
+++ b/src/resampler/resampler.cpp
@@ -1221,4 +1221,4 @@ char* Resampler::get_filter_name(int filter_num)
return g_filters[filter_num].name;
}
-#endif \ No newline at end of file
+#endif