diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-10 10:27:18 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-10-10 10:27:18 +0200 |
| commit | 17ae45e0fd5a5574d5175657d8ce901ce79f2379 (patch) | |
| tree | 19957faec40d0e48a87568d9634e403c49062728 | |
| parent | b67be23b15a58c4f287a0d54534ec557772f8524 (diff) | |
| parent | 0336aab797227d7d3716dd2cbe0c2fdca689ef8d (diff) | |
| download | nx-libs-17ae45e0fd5a5574d5175657d8ce901ce79f2379.tar.gz nx-libs-17ae45e0fd5a5574d5175657d8ce901ce79f2379.tar.bz2 nx-libs-17ae45e0fd5a5574d5175657d8ce901ce79f2379.zip | |
Merge branch 'Ionic-add-stray-files-to-gitignore' into 3.6.x
Attributes GH PR #524: https://github.com/ArcticaProject/nx-libs/pull/524
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | nx-X11/config/cf/.gitignore | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e86e4b5f7..0d9049de9 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,11 @@ config.status configure depend.status *~ +*.sw? [#]* stamp-h* .libs .deps bin/nxagent bin/nxproxy +**/.pc diff --git a/nx-X11/config/cf/.gitignore b/nx-X11/config/cf/.gitignore new file mode 100644 index 000000000..84793355f --- /dev/null +++ b/nx-X11/config/cf/.gitignore @@ -0,0 +1,2 @@ +date.def +nxversion.def |