summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2011-04-25 18:49:04 +0200
committerJonathan Bauer2011-04-25 18:49:04 +0200
commita9aba584b608ad34ae78ad019da8ab51b312c78f (patch)
tree4f8acb9bbc944b8a4acac57f6e5814b3f6346e68
parentdebug mode messages, fbgui update (diff)
parentfbgui update (diff)
downloadusb-boot-stick-a9aba584b608ad34ae78ad019da8ab51b312c78f.tar.gz
usb-boot-stick-a9aba584b608ad34ae78ad019da8ab51b312c78f.tar.xz
usb-boot-stick-a9aba584b608ad34ae78ad019da8ab51b312c78f.zip
Merge branch 'master' of git.openslx.org:openslx-ng/usb-boot-stick
Conflicts: build/rootfs/bin/fbgui
-rwxr-xr-xbuild/rootfs/bin/fbguibin2439112 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/build/rootfs/bin/fbgui b/build/rootfs/bin/fbgui
deleted file mode 100755
index ef7d202..0000000
--- a/build/rootfs/bin/fbgui
+++ /dev/null
Binary files differ