summaryrefslogtreecommitdiff
path: root/sd/util
diff options
context:
space:
mode:
authorAndre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM>2010-07-08 12:27:24 +0200
committerAndre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM>2010-07-08 12:27:24 +0200
commit436416a6320037855846fce127a0cfa77ac45270 (patch)
tree2a6326eecb06a6996d68580df4b8260515c46b4c /sd/util
parentdf76bfb0695d19d201936df80192108e7ce51b8c (diff)
renaissance1: resolved merge conflicts, cleanup.
Diffstat (limited to 'sd/util')
-rwxr-xr-x[-rw-r--r--]sd/util/exports.dxp0
-rwxr-xr-x[-rw-r--r--]sd/util/hidother.hrc0
-rwxr-xr-x[-rw-r--r--]sd/util/hidother.src0
-rwxr-xr-x[-rw-r--r--]sd/util/makefile.mk0
-rwxr-xr-x[-rw-r--r--]sd/util/makefile.pmk0
-rwxr-xr-x[-rw-r--r--]sd/util/sd.flt0
-rwxr-xr-x[-rw-r--r--]sd/util/sdfilt.map0
-rwxr-xr-x[-rw-r--r--]sd/util/sdui.map0
8 files changed, 0 insertions, 0 deletions
diff --git a/sd/util/exports.dxp b/sd/util/exports.dxp
index 0c2e3e7cddd7..0c2e3e7cddd7 100644..100755
--- a/sd/util/exports.dxp
+++ b/sd/util/exports.dxp
diff --git a/sd/util/hidother.hrc b/sd/util/hidother.hrc
index 5169a3c2ed07..5169a3c2ed07 100644..100755
--- a/sd/util/hidother.hrc
+++ b/sd/util/hidother.hrc
diff --git a/sd/util/hidother.src b/sd/util/hidother.src
index 1a15c421b419..1a15c421b419 100644..100755
--- a/sd/util/hidother.src
+++ b/sd/util/hidother.src
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 8cc7bd3345e6..8cc7bd3345e6 100644..100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
diff --git a/sd/util/makefile.pmk b/sd/util/makefile.pmk
index 0ae6fe664de7..0ae6fe664de7 100644..100755
--- a/sd/util/makefile.pmk
+++ b/sd/util/makefile.pmk
diff --git a/sd/util/sd.flt b/sd/util/sd.flt
index 83c763492233..83c763492233 100644..100755
--- a/sd/util/sd.flt
+++ b/sd/util/sd.flt
diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map
index e38cc1e8c597..e38cc1e8c597 100644..100755
--- a/sd/util/sdfilt.map
+++ b/sd/util/sdfilt.map
diff --git a/sd/util/sdui.map b/sd/util/sdui.map
index ad5e33836c7c..ad5e33836c7c 100644..100755
--- a/sd/util/sdui.map
+++ b/sd/util/sdui.map