Merge remote-tracking branch 'origin/master'

Conflicts:
	drivers/windows/dir_access_windows.cpp

1 files changed, 24 insertions, 24 deletions

diff --git a/tools/editor/pane_drag.h b/tools/editor/pane_drag.h
index 268c940e35..a6cd9b6662 100644
--- a/tools/editor/pane_drag.h
+++ b/tools/editor/pane_drag.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       */
@@ -26,26 +26,26 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef PANE_DRAG_H

-#define PANE_DRAG_H

-

-#include "scene/gui/control.h"

-

-class PaneDrag : public Control {

-

-	OBJ_TYPE( PaneDrag, Control );

-

-	bool mouse_over;

-

-

-protected:

-

-	void _input_event(const InputEvent& p_input);

-	void _notification(int p_what);

-	virtual Size2 get_minimum_size() const;

-	static void _bind_methods();

-public:

-	PaneDrag();

-};

-

-#endif // PANE_DRAG_H

+#ifndef PANE_DRAG_H
+#define PANE_DRAG_H
+
+#include "scene/gui/control.h"
+
+class PaneDrag : public Control {
+
+	OBJ_TYPE( PaneDrag, Control );
+
+	bool mouse_over;
+
+
+protected:
+
+	void _input_event(const InputEvent& p_input);
+	void _notification(int p_what);
+	virtual Size2 get_minimum_size() const;
+	static void _bind_methods();
+public:
+	PaneDrag();
+};
+
+#endif // PANE_DRAG_H