Juan Linietsky fbbe7dcdfb Merge remote-tracking branch 'origin/master' ...

Conflicts:
	drivers/windows/dir_access_windows.cpp

2015-05-04 13:24:02 -03:00

..

android

fixed broken comment block

2015-05-03 02:04:30 +02:00

bb10

-Changed Godot exit to be clean.

2015-04-20 19:38:02 -03:00

flash

Build System Changes

2014-10-07 01:31:49 -03:00

iphone

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

isim

Fix iOS Simulator SDK path for isim platform.

2015-01-22 22:19:45 +01:00

javascript

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

nacl

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

osx

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

server

Updated copyright year in all headers

2015-04-18 14:38:54 -03:00

windows

Merge remote-tracking branch 'origin/master'

2015-05-04 13:24:02 -03:00

winrt

support for light and normal mapping in 2D

2015-02-18 19:40:02 -03:00

x11

-some cleanups

2015-04-30 10:06:18 -03:00