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 --- core/object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/object.h') diff --git a/core/object.h b/core/object.h index 0bd3d09c21..e828a24767 100644 --- a/core/object.h +++ b/core/object.h @@ -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 From b2b514367824263e2dc1e26b010b0df63fd3700a Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 1 May 2015 02:53:41 +0200 Subject: Sort xml files, so order is constant Makes xml format work better with version control systems. --- core/object.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core/object.h') diff --git a/core/object.h b/core/object.h index e828a24767..44464ab199 100644 --- a/core/object.h +++ b/core/object.h @@ -111,6 +111,9 @@ struct PropertyInfo { PropertyInfo( Variant::Type p_type, const String p_name, PropertyHint p_hint=PROPERTY_HINT_NONE, const String& p_hint_string="",uint32_t p_usage=PROPERTY_USAGE_DEFAULT) { type=p_type; name=p_name; hint=p_hint; hint_string=p_hint_string; usage=p_usage; } + bool operator<(const PropertyInfo& p_info) const { + return name