Merge branch 'master' of git+ssh://danw@dev.laptop.org/git/sugar
This commit is contained in:
		
						commit
						741a424166
					
				
							
								
								
									
										1
									
								
								NEWS
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								NEWS
									
									
									
									
									
								
							@ -1,3 +1,4 @@
 | 
				
			|||||||
 | 
					* #2211 New XRestop interface style in Developer Console (edsiper)
 | 
				
			||||||
* #3649 Human readable file names on USB. (marco)
 | 
					* #3649 Human readable file names on USB. (marco)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Snapshot b8ce5083b7
 | 
					Snapshot b8ce5083b7
 | 
				
			||||||
 | 
				
			|||||||
@ -82,6 +82,7 @@ services/console/interface/memphis/Makefile
 | 
				
			|||||||
services/console/interface/network/Makefile
 | 
					services/console/interface/network/Makefile
 | 
				
			||||||
services/console/interface/logviewer/Makefile
 | 
					services/console/interface/logviewer/Makefile
 | 
				
			||||||
services/console/interface/terminal/Makefile
 | 
					services/console/interface/terminal/Makefile
 | 
				
			||||||
 | 
					services/console/interface/xserver/Makefile
 | 
				
			||||||
sugar/Makefile
 | 
					sugar/Makefile
 | 
				
			||||||
sugar/activity/Makefile
 | 
					sugar/activity/Makefile
 | 
				
			||||||
sugar/bundle/Makefile
 | 
					sugar/bundle/Makefile
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,4 @@
 | 
				
			|||||||
SUBDIRS = memphis network logviewer terminal xo
 | 
					SUBDIRS = memphis network logviewer terminal xo xserver
 | 
				
			||||||
 | 
					
 | 
				
			||||||
sugardir = $(pkgdatadir)/services/console/interface
 | 
					sugardir = $(pkgdatadir)/services/console/interface
 | 
				
			||||||
sugar_PYTHON =				\
 | 
					sugar_PYTHON =				\
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
SUBDIRS = procmem graphics net ui
 | 
					SUBDIRS = procmem graphics net ui
 | 
				
			||||||
 | 
					
 | 
				
			||||||
sugardir = $(pkgdatadir)/shell/console/lib
 | 
					sugardir = $(pkgdatadir)/services/console/lib
 | 
				
			||||||
sugar_PYTHON =                          \
 | 
					sugar_PYTHON =                          \
 | 
				
			||||||
        pyxres.py                     
 | 
					        pyxres.py                     
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user