From b4b729a15e577c68f64e0ac69fb299de6f5f706c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Apr 2014 16:58:24 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet

---
 src/activations.h |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/activations.h b/src/activations.h
index 889453f..9474121 100644
--- a/src/activations.h
+++ b/src/activations.h
@@ -7,8 +7,9 @@
 
 ACTIVATION get_activation(char *s);
 
-double activate(double x, ACTIVATION a);
-double gradient(double x, ACTIVATION a);
+char *get_activation_string(ACTIVATION a);
+float activate(float x, ACTIVATION a);
+float gradient(float x, ACTIVATION a);
 
 #endif
 

--
Gitblit v1.10.0