Conflicts: hw/xnest/Pixmap.c include/dix.h  | 
			||
|---|---|---|
| .. | ||
| .gitignore | ||
| Makefile.am | ||
| Xserver.man.pre | ||
| c-extensions | ||
| smartsched | ||
				
					
						
							Conflicts: hw/xnest/Pixmap.c include/dix.h  | 
			||
|---|---|---|
| .. | ||
| .gitignore | ||
| Makefile.am | ||
| Xserver.man.pre | ||
| c-extensions | ||
| smartsched | ||