aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-18 00:06:30 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-18 00:06:30 +0100
commitedeca4affd92f5eea4595d06f36ba8bb2c149831 (patch)
treeef5f975fec842de99d777842806c2925c6699cb4
parent1f60704371940a34c51c1badad7de1a22aba5fb7 (diff)
parent7993d28f1d4cd835980d81993bf53854441a6705 (diff)
downloadnx-libs-edeca4affd92f5eea4595d06f36ba8bb2c149831.tar.gz
nx-libs-edeca4affd92f5eea4595d06f36ba8bb2c149831.tar.bz2
nx-libs-edeca4affd92f5eea4595d06f36ba8bb2c149831.zip
Merge branch 'uli42-pr/gitignore' into 3.6.x
Attributes GH PR #280: https://github.com/ArcticaProject/nx-libs/pull/280
-rw-r--r--.gitignore13
-rw-r--r--nx-X11/.gitignore5
-rw-r--r--nx-X11/include/.gitignore5
-rw-r--r--nx-X11/lib/X11/.gitignore1
-rw-r--r--nx-X11/programs/Xserver/.gitignore2
-rw-r--r--nx-X11/programs/Xserver/GL/.gitignore341
-rw-r--r--nx-X11/programs/Xserver/composite/.gitignore0
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/.gitignore3
-rw-r--r--nx-X11/programs/Xserver/include/.gitignore1
-rw-r--r--nxcomp/.gitignore2
-rw-r--r--nxcompext/.gitignore2
-rw-r--r--nxcompshad/.gitignore2
-rw-r--r--nxproxy/.gitignore2
13 files changed, 379 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..325bebed4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+.gitignore
+*.o
+*.so.*
+*.so
+*.a
+xmakefile
+autom4te.cache/
+config.log
+config.status
+configure
+depend.status
+*~
+[#]*
diff --git a/nx-X11/.gitignore b/nx-X11/.gitignore
new file mode 100644
index 000000000..8e0d8bf9d
--- /dev/null
+++ b/nx-X11/.gitignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.bak
+xmakefile
+exports/
+.build-exports/
diff --git a/nx-X11/include/.gitignore b/nx-X11/include/.gitignore
new file mode 100644
index 000000000..16951a0af
--- /dev/null
+++ b/nx-X11/include/.gitignore
@@ -0,0 +1,5 @@
+GL/gl.h
+GL/glext.h
+GL/glxext.h
+GL/osmesa.h
+Xpoll.h
diff --git a/nx-X11/lib/X11/.gitignore b/nx-X11/lib/X11/.gitignore
new file mode 100644
index 000000000..8215e21de
--- /dev/null
+++ b/nx-X11/lib/X11/.gitignore
@@ -0,0 +1 @@
+ks_tables.h \ No newline at end of file
diff --git a/nx-X11/programs/Xserver/.gitignore b/nx-X11/programs/Xserver/.gitignore
new file mode 100644
index 000000000..ea37aa3ef
--- /dev/null
+++ b/nx-X11/programs/Xserver/.gitignore
@@ -0,0 +1,2 @@
+nxagent
+nxagent.bak
diff --git a/nx-X11/programs/Xserver/GL/.gitignore b/nx-X11/programs/Xserver/GL/.gitignore
new file mode 100644
index 000000000..5231f1978
--- /dev/null
+++ b/nx-X11/programs/Xserver/GL/.gitignore
@@ -0,0 +1,341 @@
+glx/DONE
+glx/glcontextmodes.c
+glx/glcontextmodes.h
+glx/indirect_size.c
+glx/indirect_size.h
+mesa/X/DONE
+mesa/X/compsize.c
+mesa/X/driverfuncs.c
+mesa/X/driverfuncs.h
+mesa/X/xm_api.c
+mesa/X/xm_buffer.c
+mesa/X/xm_dd.c
+mesa/X/xm_line.c
+mesa/X/xm_span.c
+mesa/X/xm_tri.c
+mesa/array_cache/DONE
+mesa/array_cache/ac_context.c
+mesa/array_cache/ac_context.h
+mesa/array_cache/ac_import.c
+mesa/array_cache/acache.h
+mesa/main/DONE
+mesa/main/accum.c
+mesa/main/accum.h
+mesa/main/api_arrayelt.c
+mesa/main/api_arrayelt.h
+mesa/main/api_eval.h
+mesa/main/api_loopback.c
+mesa/main/api_loopback.h
+mesa/main/api_noop.c
+mesa/main/api_noop.h
+mesa/main/api_validate.c
+mesa/main/api_validate.h
+mesa/main/attrib.c
+mesa/main/attrib.h
+mesa/main/blend.c
+mesa/main/blend.h
+mesa/main/bufferobj.c
+mesa/main/bufferobj.h
+mesa/main/buffers.c
+mesa/main/buffers.h
+mesa/main/clip.c
+mesa/main/clip.h
+mesa/main/colormac.h
+mesa/main/colortab.c
+mesa/main/colortab.h
+mesa/main/config.h
+mesa/main/context.c
+mesa/main/context.h
+mesa/main/convolve.c
+mesa/main/convolve.h
+mesa/main/dd.h
+mesa/main/debug.c
+mesa/main/debug.h
+mesa/main/depth.c
+mesa/main/depth.h
+mesa/main/dispatch.c
+mesa/main/dlist.c
+mesa/main/dlist.h
+mesa/main/drawpix.c
+mesa/main/drawpix.h
+mesa/main/enable.c
+mesa/main/enable.h
+mesa/main/enums.c
+mesa/main/enums.h
+mesa/main/eval.c
+mesa/main/eval.h
+mesa/main/execmem.c
+mesa/main/extensions.c
+mesa/main/extensions.h
+mesa/main/fbobject.c
+mesa/main/fbobject.h
+mesa/main/feedback.c
+mesa/main/feedback.h
+mesa/main/fog.c
+mesa/main/fog.h
+mesa/main/framebuffer.c
+mesa/main/framebuffer.h
+mesa/main/get.c
+mesa/main/get.h
+mesa/main/getstring.c
+mesa/main/glapi.c
+mesa/main/glheader.h
+mesa/main/glthread.c
+mesa/main/hash.c
+mesa/main/hash.h
+mesa/main/hint.c
+mesa/main/hint.h
+mesa/main/histogram.c
+mesa/main/histogram.h
+mesa/main/image.c
+mesa/main/image.h
+mesa/main/imports.c
+mesa/main/imports.h
+mesa/main/light.c
+mesa/main/light.h
+mesa/main/lines.c
+mesa/main/lines.h
+mesa/main/macros.h
+mesa/main/matrix.c
+mesa/main/matrix.h
+mesa/main/mm.c
+mesa/main/mm.h
+mesa/main/mtypes.h
+mesa/main/occlude.c
+mesa/main/occlude.h
+mesa/main/pixel.c
+mesa/main/pixel.h
+mesa/main/points.c
+mesa/main/points.h
+mesa/main/polygon.c
+mesa/main/polygon.h
+mesa/main/rastpos.c
+mesa/main/rastpos.h
+mesa/main/renderbuffer.c
+mesa/main/renderbuffer.h
+mesa/main/simple_list.h
+mesa/main/state.c
+mesa/main/state.h
+mesa/main/stencil.c
+mesa/main/stencil.h
+mesa/main/texcompress.c
+mesa/main/texcompress.h
+mesa/main/texcompress_fxt1.c
+mesa/main/texcompress_s3tc.c
+mesa/main/texenvprogram.c
+mesa/main/texenvprogram.h
+mesa/main/texformat.c
+mesa/main/texformat.h
+mesa/main/texformat_tmp.h
+mesa/main/teximage.c
+mesa/main/teximage.h
+mesa/main/texobj.c
+mesa/main/texobj.h
+mesa/main/texrender.c
+mesa/main/texrender.h
+mesa/main/texstate.c
+mesa/main/texstate.h
+mesa/main/texstore.c
+mesa/main/texstore.h
+mesa/main/varray.c
+mesa/main/varray.h
+mesa/main/version.h
+mesa/main/vtxfmt.c
+mesa/main/vtxfmt.h
+mesa/main/vtxfmt_tmp.h
+mesa/math/DONE
+mesa/math/m_clip_tmp.h
+mesa/math/m_copy_tmp.h
+mesa/math/m_debug.h
+mesa/math/m_debug_clip.c
+mesa/math/m_debug_norm.c
+mesa/math/m_debug_util.h
+mesa/math/m_debug_xform.c
+mesa/math/m_dotprod_tmp.h
+mesa/math/m_eval.c
+mesa/math/m_eval.h
+mesa/math/m_matrix.c
+mesa/math/m_matrix.h
+mesa/math/m_norm_tmp.h
+mesa/math/m_trans_tmp.h
+mesa/math/m_translate.c
+mesa/math/m_translate.h
+mesa/math/m_vector.c
+mesa/math/m_vector.h
+mesa/math/m_xform.c
+mesa/math/m_xform.h
+mesa/math/m_xform_tmp.h
+mesa/math/mathmod.h
+mesa/shader/DONE
+mesa/shader/arbfragparse.c
+mesa/shader/arbfragparse.h
+mesa/shader/arbprogparse.c
+mesa/shader/arbprogparse.h
+mesa/shader/arbprogram.c
+mesa/shader/arbprogram.h
+mesa/shader/arbprogram_syn.h
+mesa/shader/arbvertparse.c
+mesa/shader/arbvertparse.h
+mesa/shader/atifragshader.c
+mesa/shader/atifragshader.h
+mesa/shader/grammar/DONE
+mesa/shader/grammar/grammar.c
+mesa/shader/grammar/grammar.h
+mesa/shader/grammar/grammar_mesa.c
+mesa/shader/grammar/grammar_mesa.h
+mesa/shader/grammar/grammar_syn.h
+mesa/shader/nvfragparse.c
+mesa/shader/nvfragparse.h
+mesa/shader/nvfragprog.h
+mesa/shader/nvprogram.c
+mesa/shader/nvprogram.h
+mesa/shader/nvvertexec.c
+mesa/shader/nvvertexec.h
+mesa/shader/nvvertparse.c
+mesa/shader/nvvertparse.h
+mesa/shader/nvvertprog.h
+mesa/shader/program.c
+mesa/shader/program.h
+mesa/shader/shaderobjects.c
+mesa/shader/shaderobjects.h
+mesa/shader/shaderobjects_3dlabs.c
+mesa/shader/shaderobjects_3dlabs.h
+mesa/shader/slang/DONE
+mesa/shader/slang/library/slang_common_builtin_gc.h
+mesa/shader/slang/library/slang_common_builtin_gc_bin.h
+mesa/shader/slang/library/slang_core_gc.h
+mesa/shader/slang/library/slang_core_gc_bin.h
+mesa/shader/slang/library/slang_fragment_builtin_gc.h
+mesa/shader/slang/library/slang_fragment_builtin_gc_bin.h
+mesa/shader/slang/library/slang_shader_syn.h
+mesa/shader/slang/library/slang_version_syn.h
+mesa/shader/slang/library/slang_vertex_builtin_gc.h
+mesa/shader/slang/library/slang_vertex_builtin_gc_bin.h
+mesa/shader/slang/slang_assemble.c
+mesa/shader/slang/slang_assemble.h
+mesa/shader/slang/slang_assemble_assignment.c
+mesa/shader/slang/slang_assemble_assignment.h
+mesa/shader/slang/slang_assemble_conditional.c
+mesa/shader/slang/slang_assemble_conditional.h
+mesa/shader/slang/slang_assemble_constructor.c
+mesa/shader/slang/slang_assemble_constructor.h
+mesa/shader/slang/slang_assemble_typeinfo.c
+mesa/shader/slang/slang_assemble_typeinfo.h
+mesa/shader/slang/slang_compile.c
+mesa/shader/slang/slang_compile.h
+mesa/shader/slang/slang_execute.c
+mesa/shader/slang/slang_execute.h
+mesa/shader/slang/slang_preprocess.c
+mesa/shader/slang/slang_preprocess.h
+mesa/shader/slang/slang_storage.c
+mesa/shader/slang/slang_storage.h
+mesa/shader/slang/slang_utility.c
+mesa/shader/slang/slang_utility.h
+mesa/shader/slang/traverse_wrap.h
+mesa/swrast/DONE
+mesa/swrast/s_aaline.c
+mesa/swrast/s_aaline.h
+mesa/swrast/s_aalinetemp.h
+mesa/swrast/s_aatriangle.c
+mesa/swrast/s_aatriangle.h
+mesa/swrast/s_aatritemp.h
+mesa/swrast/s_accum.c
+mesa/swrast/s_accum.h
+mesa/swrast/s_alpha.c
+mesa/swrast/s_alpha.h
+mesa/swrast/s_atifragshader.c
+mesa/swrast/s_atifragshader.h
+mesa/swrast/s_bitmap.c
+mesa/swrast/s_blend.c
+mesa/swrast/s_blend.h
+mesa/swrast/s_buffers.c
+mesa/swrast/s_context.c
+mesa/swrast/s_context.h
+mesa/swrast/s_copypix.c
+mesa/swrast/s_depth.c
+mesa/swrast/s_depth.h
+mesa/swrast/s_drawpix.c
+mesa/swrast/s_drawpix.h
+mesa/swrast/s_feedback.c
+mesa/swrast/s_feedback.h
+mesa/swrast/s_fog.c
+mesa/swrast/s_fog.h
+mesa/swrast/s_imaging.c
+mesa/swrast/s_lines.c
+mesa/swrast/s_lines.h
+mesa/swrast/s_linetemp.h
+mesa/swrast/s_logic.c
+mesa/swrast/s_logic.h
+mesa/swrast/s_masking.c
+mesa/swrast/s_masking.h
+mesa/swrast/s_nvfragprog.c
+mesa/swrast/s_nvfragprog.h
+mesa/swrast/s_pixeltex.c
+mesa/swrast/s_pixeltex.h
+mesa/swrast/s_points.c
+mesa/swrast/s_points.h
+mesa/swrast/s_pointtemp.h
+mesa/swrast/s_readpix.c
+mesa/swrast/s_span.c
+mesa/swrast/s_span.h
+mesa/swrast/s_spantemp.h
+mesa/swrast/s_stencil.c
+mesa/swrast/s_stencil.h
+mesa/swrast/s_texstore.c
+mesa/swrast/s_texture.c
+mesa/swrast/s_texture.h
+mesa/swrast/s_triangle.c
+mesa/swrast/s_triangle.h
+mesa/swrast/s_trispan.h
+mesa/swrast/s_tritemp.h
+mesa/swrast/s_zoom.c
+mesa/swrast/s_zoom.h
+mesa/swrast/swrast.h
+mesa/swrast_setup/DONE
+mesa/swrast_setup/ss_context.c
+mesa/swrast_setup/ss_context.h
+mesa/swrast_setup/ss_triangle.c
+mesa/swrast_setup/ss_triangle.h
+mesa/swrast_setup/ss_tritmp.h
+mesa/swrast_setup/swrast_setup.h
+mesa/tnl/DONE
+mesa/tnl/t_array_api.c
+mesa/tnl/t_array_api.h
+mesa/tnl/t_array_import.c
+mesa/tnl/t_array_import.h
+mesa/tnl/t_context.c
+mesa/tnl/t_context.h
+mesa/tnl/t_pipeline.c
+mesa/tnl/t_pipeline.h
+mesa/tnl/t_save_api.c
+mesa/tnl/t_save_api.h
+mesa/tnl/t_save_loopback.c
+mesa/tnl/t_save_playback.c
+mesa/tnl/t_vb_arbprogram.c
+mesa/tnl/t_vb_arbprogram.h
+mesa/tnl/t_vb_arbprogram_sse.c
+mesa/tnl/t_vb_cliptmp.h
+mesa/tnl/t_vb_cull.c
+mesa/tnl/t_vb_fog.c
+mesa/tnl/t_vb_light.c
+mesa/tnl/t_vb_lighttmp.h
+mesa/tnl/t_vb_normals.c
+mesa/tnl/t_vb_points.c
+mesa/tnl/t_vb_program.c
+mesa/tnl/t_vb_render.c
+mesa/tnl/t_vb_rendertmp.h
+mesa/tnl/t_vb_texgen.c
+mesa/tnl/t_vb_texmat.c
+mesa/tnl/t_vb_vertex.c
+mesa/tnl/t_vertex.c
+mesa/tnl/t_vertex.h
+mesa/tnl/t_vertex_generic.c
+mesa/tnl/t_vertex_sse.c
+mesa/tnl/t_vp_build.c
+mesa/tnl/t_vp_build.h
+mesa/tnl/t_vtx_api.c
+mesa/tnl/t_vtx_api.h
+mesa/tnl/t_vtx_eval.c
+mesa/tnl/t_vtx_exec.c
+mesa/tnl/t_vtx_generic.c
+mesa/tnl/tnl.h
diff --git a/nx-X11/programs/Xserver/composite/.gitignore b/nx-X11/programs/Xserver/composite/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/nx-X11/programs/Xserver/composite/.gitignore
diff --git a/nx-X11/programs/Xserver/hw/nxagent/.gitignore b/nx-X11/programs/Xserver/hw/nxagent/.gitignore
new file mode 100644
index 000000000..256534b63
--- /dev/null
+++ b/nx-X11/programs/Xserver/hw/nxagent/.gitignore
@@ -0,0 +1,3 @@
+miinitext.c
+stubs.c
+xpstubs.c
diff --git a/nx-X11/programs/Xserver/include/.gitignore b/nx-X11/programs/Xserver/include/.gitignore
new file mode 100644
index 000000000..919ccf080
--- /dev/null
+++ b/nx-X11/programs/Xserver/include/.gitignore
@@ -0,0 +1 @@
+osdep.h
diff --git a/nxcomp/.gitignore b/nxcomp/.gitignore
new file mode 100644
index 000000000..27a99e5b2
--- /dev/null
+++ b/nxcomp/.gitignore
@@ -0,0 +1,2 @@
+nxcomp.pc
+Makefile
diff --git a/nxcompext/.gitignore b/nxcompext/.gitignore
new file mode 100644
index 000000000..4dbbba27e
--- /dev/null
+++ b/nxcompext/.gitignore
@@ -0,0 +1,2 @@
+nxcompext.pc
+Makefile
diff --git a/nxcompshad/.gitignore b/nxcompshad/.gitignore
new file mode 100644
index 000000000..f083c6b27
--- /dev/null
+++ b/nxcompshad/.gitignore
@@ -0,0 +1,2 @@
+nxcompshad.pc
+Makefile
diff --git a/nxproxy/.gitignore b/nxproxy/.gitignore
new file mode 100644
index 000000000..3d98254b2
--- /dev/null
+++ b/nxproxy/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+nxproxy