From fdaa2920eb21fff3320a17e9239e04dfadecdb00 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 18 Apr 2015 14:38:54 -0300
Subject: Updated copyright year in all headers

---
 scene/resources/font.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scene/resources/font.cpp')

diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 79316f001..a598c6908 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
-- 
cgit v1.2.3-70-g09d2


From 5ffa3f4ff01352fe047cffeddc8681e71af264fc Mon Sep 17 00:00:00 2001
From: volzhs
Date: Wed, 10 Jun 2015 02:23:47 +0900
Subject: add bind method for create_from_fnt (load fnt made by BMFont)

---
 scene/resources/font.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scene/resources/font.cpp')

diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index a598c6908..44fa7eadb 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -510,6 +510,7 @@ float Font::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_
 
 void Font::_bind_methods() {
 
+    ObjectTypeDB::bind_method(_MD("create_from_fnt","path"),&Font::create_from_fnt);
 	ObjectTypeDB::bind_method(_MD("set_height","px"),&Font::set_height);
 	ObjectTypeDB::bind_method(_MD("get_height"),&Font::get_height);
 
-- 
cgit v1.2.3-70-g09d2


From 9bee9e7498c701f7dfbb0f68b69272143216693f Mon Sep 17 00:00:00 2001
From: volzhs
Date: Wed, 10 Jun 2015 02:25:34 +0900
Subject: add bind method for create_from_fnt (load fnt made by BMFont)

---
 scene/resources/font.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scene/resources/font.cpp')

diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 44fa7eadb..2d93113b4 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -510,7 +510,7 @@ float Font::draw_char(RID p_canvas_item, const Point2& p_pos, const CharType& p_
 
 void Font::_bind_methods() {
 
-    ObjectTypeDB::bind_method(_MD("create_from_fnt","path"),&Font::create_from_fnt);
+	ObjectTypeDB::bind_method(_MD("create_from_fnt","path"),&Font::create_from_fnt);
 	ObjectTypeDB::bind_method(_MD("set_height","px"),&Font::set_height);
 	ObjectTypeDB::bind_method(_MD("get_height"),&Font::get_height);
 
-- 
cgit v1.2.3-70-g09d2