diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-26 19:07:17 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2010-09-26 19:07:17 +0000 |
| commit | e59f25e6a0d9d18f07ee5b249c535edfbfdb832e (patch) | |
| tree | 4cb9e12987d0e520378e1533a8e73a87354eda34 /main/portmap/commit-queue | |
| parent | d0077a675b28a5adbdacb983da0faabadc0057bc (diff) | |
| parent | d9e47f0a9da3e21f1fbda6eef5e978e6fb5d3116 (diff) | |
| download | aports-e59f25e6a0d9d18f07ee5b249c535edfbfdb832e.tar.bz2 aports-e59f25e6a0d9d18f07ee5b249c535edfbfdb832e.tar.xz | |
Merge remote branch 'ncopa/master'
Conflicts:
main/nagios/APKBUILD
main/nagios/nagios.pre-install
Diffstat (limited to 'main/portmap/commit-queue')
| -rw-r--r-- | main/portmap/commit-queue | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/portmap/commit-queue b/main/portmap/commit-queue deleted file mode 100644 index 186b45ada..000000000 --- a/main/portmap/commit-queue +++ /dev/null @@ -1 +0,0 @@ -portmap |