Vadim Grigoruk
							
						 
					 | 
					
						
						
							
						
						b41b0436ab
					 | 
					
						
						
							
							Merge branch '#320'
						
						
						
						
						
						
						
						# Conflicts:
#	.gitignore
#	.travis.yml
#	Makefile
#	bin/assets/config.tic.dat
#	bin/assets/fenneldemo.tic.dat
#	bin/assets/tic.js.dat
#	build.sh
#	build/windows/example/example.vcxproj
#	build/windows/sdl-gpu/sdl-gpu.vcxproj
#	build/windows/studio/studio.vcxproj
#	build/windows/tic/tic.aps
#	build/windows/tic/tic.rc
#	build/windows/tic80/tic80.vcxproj
#	build/windows/zlib/zlib.vcxproj
#	build/windows/zlib/zlib.vcxproj.filters
#	include/tic80_config.h 
						
						
					 | 
					
						2018-09-04 11:13:20 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Grigoruk
							
						 
					 | 
					
						
						
							
						
						9e59ce5ca6
					 | 
					
						
						
							
							reverted to XP
						
						
						
						
						
						
					 | 
					
						2018-08-14 17:25:43 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Grigoruk
							
						 
					 | 
					
						
						
							
						
						f294e73f40
					 | 
					
						
						
							
							project updated to VS2017
						
						
						
						
						
						
						
						fixed variable in text api 
						
						
					 | 
					
						2018-08-09 23:50:15 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Grigoruk
							
						 
					 | 
					
						
						
							
						
						ba503ea3e3
					 | 
					
						
						
							
							#320: removed Visual Studio project
						
						
						
						
						
						
					 | 
					
						2018-06-30 12:35:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								BADIM-PC\Vadim
							
						 
					 | 
					
						
						
							
						
						81fbd92f60
					 | 
					
						
						
							
							VS compilation fix
						
						
						
						
						
						
					 | 
					
						2018-02-28 20:11:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								BADIM-PC\Vadim
							
						 
					 | 
					
						
						
							
						
						83b83c113a
					 | 
					
						
						
							
							no message
						
						
						
						
						
						
					 | 
					
						2018-02-22 13:55:41 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								BADIM-PC\Vadim
							
						 
					 | 
					
						
						
							
						
						f7da6b7f51
					 | 
					
						
						
							
							VS2015 works
						
						
						
						
						
						
					 | 
					
						2018-02-21 16:01:45 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |