Changeset 58381 in vbox

Timestamp:

Oct 22, 2015 5:03:43 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103613

Message:

gen-slickedit-workspace: skip svnpatch reject files.

File:

• trunk/tools/bin/gen-slickedit-workspace.sh (modified) (2 diffs)

trunk/tools/bin/gen-slickedit-workspace.sh

@@ -171 +171 @@
         MY_FOLDER="$1-All.lst"
     fi
-    EXCLUDES="*.log;*.kup;*~;*.pyc;*.exe;*.sys;*.dll;*.o;*.obj;*.lib;*.a;*.ko;*.class;*.cvsignore;*.done;*.project;*.actionScriptProperties;*.scm-settings;*.svn-base;.svn/*"
+    EXCLUDES="*.log;*.kup;*~;*.pyc;*.exe;*.sys;*.dll;*.o;*.obj;*.lib;*.a;*.ko;*.class;*.cvsignore;*.done;*.project;*.actionScriptProperties;*.scm-settings;*.svnpatch.rej;*.svn-base;.svn/*"
     echo '        <F N="'"${2}"'/*" Recurse="1" Excludes="'"${EXCLUDES}"'"/>' >> "${MY_FOLDER}"
 }
@@ -830 +830 @@
     "include/VBox/vmm/dbgf.h" \
     "include/VBox/vmm/em.h" \
+    "include/VBox/vmm/gim.h" \
     "include/VBox/vmm/gmm.*" \
     "include/VBox/vmm/gvm.*" \