Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox
This commit is contained in:
		
						commit
						659dbb4a99
					
				
					 3 changed files with 3 additions and 2 deletions
				
			
		| 
						 | 
					@ -15,7 +15,7 @@ before_script:
 | 
				
			||||||
        build-essential \
 | 
					        build-essential \
 | 
				
			||||||
        curl \
 | 
					        curl \
 | 
				
			||||||
        flex \
 | 
					        flex \
 | 
				
			||||||
        fuse \
 | 
					        fuse3 \
 | 
				
			||||||
        git \
 | 
					        git \
 | 
				
			||||||
        libfuse-dev \
 | 
					        libfuse-dev \
 | 
				
			||||||
        nasm \
 | 
					        nasm \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -389,6 +389,7 @@ ubuntu()
 | 
				
			||||||
		doxygen \
 | 
							doxygen \
 | 
				
			||||||
		file \
 | 
							file \
 | 
				
			||||||
		flex \
 | 
							flex \
 | 
				
			||||||
 | 
							fuse3 \
 | 
				
			||||||
		g++ \
 | 
							g++ \
 | 
				
			||||||
		genisoimage \
 | 
							genisoimage \
 | 
				
			||||||
		git \
 | 
							git \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ RUN apt-get update \
 | 
				
			||||||
        curl \
 | 
					        curl \
 | 
				
			||||||
        file \
 | 
					        file \
 | 
				
			||||||
        flex \
 | 
					        flex \
 | 
				
			||||||
        fuse \
 | 
					        fuse3 \
 | 
				
			||||||
        genisoimage \
 | 
					        genisoimage \
 | 
				
			||||||
        git \
 | 
					        git \
 | 
				
			||||||
        gperf \
 | 
					        gperf \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue