* Repurposed the FollowLink cursor as CreateLink cursor.
* Created a new FollowLink cursor based on a design by Justin Stressman, thanks!
It compiles and I proof-read the commit, otherwise I didn't test, yet.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35922 a95241bf-73f2-0310-859d-f6bbb57e9c96
a PDF file, because it could not locate the "Print To file"
transport add-on.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35860 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Fixes check for hybrid builds in installoptionalpackage script.
* Adds WifiFirmwareScriptData to the packages to ignore.
Closes#5493.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35696 a95241bf-73f2-0310-859d-f6bbb57e9c96
Create the script's tempdir before displaying the initial alert.
Fixes#5509.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35695 a95241bf-73f2-0310-859d-f6bbb57e9c96
--Cette ligne, et les suivantes ci-dessous, seront ignorées--
M data/catalogs/preferences/opengl/pt.catkeys
M data/catalogs/preferences/keymap/pt.catkeys
M data/catalogs/preferences/mouse/pt.catkeys
M data/catalogs/preferences/fonts/pt.catkeys
M data/catalogs/preferences/network/pt.catkeys
M data/catalogs/preferences/appearance/pt.catkeys
M data/catalogs/preferences/locale/pt.catkeys
M data/catalogs/preferences/keyboard/pt.catkeys
M data/catalogs/preferences/bluetooth/pt.catkeys
M data/catalogs/preferences/touchpad/pt.catkeys
M data/catalogs/preferences/cpufrequency/pt.catkeys
M data/catalogs/apps/mail/pt.catkeys
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35655 a95241bf-73f2-0310-859d-f6bbb57e9c96
Added German translation. Again feel free to improve it.
Updated copyright year in About dialog.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35639 a95241bf-73f2-0310-859d-f6bbb57e9c96
good catch, Matt!
* This closes at least a part of ticket #4844.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35502 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Added polish translation made by me
* Added myself & Hubert Hareńczyk to polish translators
* Corrected my last name
* Honor 80lines
* Style cleanup
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35439 a95241bf-73f2-0310-859d-f6bbb57e9c96
in r23974, but seeing that it was added to the runtime_loader default paths as
well I take it this was an oversight.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35427 a95241bf-73f2-0310-859d-f6bbb57e9c96
should now be able to be installed gracefully. This fixes ticket #5248.
* Enhancement of the -a parameter, so that it accepts multiple packages at once.
Multiple packages have to be included in double quotes, due to the way getopts
handles options. This fixes ticket #5315.
* Thanks mmadia for this patch!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35327 a95241bf-73f2-0310-859d-f6bbb57e9c96
One just has to love the write overlay. That one really saved a lot
of work.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35224 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Some coding style fixes along the way.
* Added German translation.
NOTE: The Installer will have to offer a way to change the current locale! So
any translations which are done at this point will have to receive one more
update after I added this feature.
NOTE2: There is something wrong with generating catalogs and the update-all
jam target. If you don't do a clean build, the build won't run through, but it
is enough to build for example an image and then run update-all on your actual
partition profile.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35209 a95241bf-73f2-0310-859d-f6bbb57e9c96
Ignore "NetFS" OptionalPackage in the installoptionalpackage script. It is a
source code only optional package which needs to be compiled from within the
tree.
Thanks a lot! Fixes#5297.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35184 a95241bf-73f2-0310-859d-f6bbb57e9c96
firmware for unshipable broadcom43xx and marvell88w8335. Furthermore it installs
the firmware for ipw2100 and iprowifi2200, which requires the user to consent
to its license terms. Thank you mmadia!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35164 a95241bf-73f2-0310-859d-f6bbb57e9c96
nightlies, though. As this will require an update of AboutSystem, which is
scheduled for a later commit.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35160 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Moved the "tmp" directory out of /var, and to /boot/common/cache/.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35104 a95241bf-73f2-0310-859d-f6bbb57e9c96
Changed strings to sentence case in various places. This is the
case-misc.diff part of ticket #5169.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35043 a95241bf-73f2-0310-859d-f6bbb57e9c96
temporary solution as long as there is no package manager available. When
executing the script, it mentions this, too. This fixes#4680. Thank you.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35041 a95241bf-73f2-0310-859d-f6bbb57e9c96
I had to uptade the catkeys as Travis tool has trouble keeping up with changes in the repository (most importantly, cpufrequency fixes and mail sentance casing). I hope nothing was lost in the process.
Travis, if you read this, I had to load the catkey files in vim and save them back to get them linked correctly by the buildtools. I suspect some line ending problem or something alike. Also, your fingerprint computation seemed wrong in most cases.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34994 a95241bf-73f2-0310-859d-f6bbb57e9c96
- Hack StatusView.cpp so it generates a proper catkey file
- StatusView archive constructor wasn't instanciating the catalog
Sync all the cpufrequency catalogs to the current strings.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34984 a95241bf-73f2-0310-859d-f6bbb57e9c96
-Updated one lituanian catalog from Algirdas. I'm too lazy to fix the others one, sorry.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34884 a95241bf-73f2-0310-859d-f6bbb57e9c96
Also update the localization catalogs as needed.
CPUFrequency localization is broken : the current code works, but the DoCatalogs jamrule is not powerful enough to properly extract the catkeys.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34767 a95241bf-73f2-0310-859d-f6bbb57e9c96
-Re-enable and update Appearance preflet translations after sentence case conversion done by Humdinger.
-This closes#5165
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34755 a95241bf-73f2-0310-859d-f6bbb57e9c96
This clean up the add-on from hand-made translation mess.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34735 a95241bf-73f2-0310-859d-f6bbb57e9c96
one more led, though), and the keys to be darker. I took this from the current
layout at the order page. The image on the main website is out of date. The
layout apparently was already up2date.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34677 a95241bf-73f2-0310-859d-f6bbb57e9c96
This saves ~0.5s of boot time here, but I suspect it might be better for CD.
Enabled loadSymbols in kernel settings so the behavior should be the same as before this change.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34666 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Properly register playlist mimetype in MediaPlayer. Double clicking them
will now open them in MediaPlayer.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34143 a95241bf-73f2-0310-859d-f6bbb57e9c96
- Missing space before semicolon (thanks to "Loïc" for noticing it)
- Use n° instead of # in french
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34026 a95241bf-73f2-0310-859d-f6bbb57e9c96
directory.
* Moved fortune files to "data/system/data" in the repository, and /system/data/
in the file system.
* Got teapot.data location wrong in the repository.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33982 a95241bf-73f2-0310-859d-f6bbb57e9c96
Ukrainian locale catalog files for Media and Keymap preflets added.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33820 a95241bf-73f2-0310-859d-f6bbb57e9c96
This changeset correct usage of this language abbreviation and restore normal function of the localized preflets.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33765 a95241bf-73f2-0310-859d-f6bbb57e9c96
--Cette ligne, et les suivantes ci-dessous, seront ignorées--
M src/preferences/appearance/Jamfile
M src/preferences/locale/Jamfile
M src/preferences/bluetooth/Jamfile
M src/preferences/cpufrequency/Jamfile
A data/catalogs/preferences/appearance/ua.catkeys
A data/catalogs/preferences/locale/ua.catkeys
M data/catalogs/preferences/locale/fr.catkeys
A data/catalogs/preferences/bluetooth/ua.catkeys
A data/catalogs/preferences/cpufrequency/ua.catkeys
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33686 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Tracker forwards auto mounter related messages to the mount_server.
* Rewrote AutoMounterSettings to not know AutoMounter and use
the layout-management.
* Moved the "Eject When Unmounting" setting into the Mount Settings.
* Launch the mount_server during boot, but delay the script until all
previously mounted volumes have been mounted. This solves some annoying
timing bugs during boot. For example when you have desktop backgrounds
on other volumes and some servers don't deal well with the situation
of links to add-ons on other volumes becoming valid with a delay...
* src/kits/tracker/Commands.h includes the private headers/private/
mount/MountServer.h header, which made adjustments to the DiskUsage
Jamfile necessary.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33555 a95241bf-73f2-0310-859d-f6bbb57e9c96
* oshaiku.c is based on a different original from a stub, therefore it
looks like a lot of comment changes.
* achaiku.h is redone completely.
* dpc is added as boot module.
* acpi_busman.c now does all mandatory steps to init.
* style fixes
* added another acpi kernel settings to avoid full init for debugging.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33236 a95241bf-73f2-0310-859d-f6bbb57e9c96
work to do, but it's about time to give this code more exposure.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33176 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Changed the Bootscript and the InstallerFinishScript to only create and
cleanup a link on the Desktop.
* Applied patch by idefix to fix removing the Installer link from volumes
that contain spaces in the name. (Thanks!)
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32995 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Color icons which can serve as something like the preferred color palette
for Haiku icons.
* Variation of the hard disk icon which you can use on the drive holding your
code.
* App icon variations for DOS-Box, YAB (or YAB applications?) and old apps.
* A Book icon
* A MemoryStick icon (Sony)
* Two variations for the Image icon
* Two USB connector icons
* A R.I.P. icon :-)
* A variation for the Devices icon which has more contrast and better
coloring
* A variation of the TV icon (I find it too dark)
* Icons for use inside Deskbar and Tracker panels
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32776 a95241bf-73f2-0310-859d-f6bbb57e9c96
list when booting from CD. Both are removed from the target in the
InstallerFinishScript. This closes ticket #4342.
* Make Installer start in safemode as well.
* Are there any objections to always have the Installer link in the Deskbar?
I see no real reason to leave it out.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32686 a95241bf-73f2-0310-859d-f6bbb57e9c96
directory. I think this should be good enough until we have session management.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32545 a95241bf-73f2-0310-859d-f6bbb57e9c96
- Move the launching of files in this directory from the Bootscript to the
UserBootscript.
- This means we now ship a working UserBootscript instead of just a sample.
- Updated documentation based on this change and Humdinger's suggestions.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32544 a95241bf-73f2-0310-859d-f6bbb57e9c96
The dead simple Bash code was just copied from Humdinger's patch on #1202. He
also suggested having a link on the Deskbar for this folder, but I don't know
if that is needed. We just need to document it, which I may do next.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32527 a95241bf-73f2-0310-859d-f6bbb57e9c96
in safe mode.
* Removed the Terminal from the Bootscript.
* Ordered the servers alphabetically in HaikuImage.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32379 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Note that you need to have the OpenSSH package installed correctly for this
to work. Otherwise your Haiku machine is no longer accessible through the
net anymore!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32322 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Now uses g++ instead of gcc for C++ files.
* Removed mwcc support.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32113 a95241bf-73f2-0310-859d-f6bbb57e9c96
It's supposed to be used when adding a legend to a screenshot. I think we
should try to avoid using it too much.
If anyone wants to improve it, you're very welcome. Right now it's only used
in queries-images/basic-query.png and apps-images/i-o-m-overview.png.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31769 a95241bf-73f2-0310-859d-f6bbb57e9c96
patch from about a year ago (I couldn't use any code of his yet, though,
but there are a few things left). The emergency keys are triggered by
pressing Alt-SysReq + key.
* By default, only Alt-SysReq+'d' is used as a means to deliberately enter
the kernel debugger. F12 belongs to userland again, now :-)
* Debugger add-ons now have another optional method to implement their own
emergency keys - 'd' for the debugger cannot be overridden, though.
* The mechanism can be turned off via a new kernel setting, so it's not that
easy anymore to "crash" Haiku if you don't want to.
* Right now, the PS/2 driver, and the pre-input_server in-kernel debugger
keyboard mini-driver support this, USB not yet.
* Minor cleanup.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31660 a95241bf-73f2-0310-859d-f6bbb57e9c96
It completes the previous patch to the Installer, this time in the Installer
FinishScript, to support making volumes with spaces in their names bootable.
Thanks a bunch!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31620 a95241bf-73f2-0310-859d-f6bbb57e9c96
http://karistouf.free.fr/images/BCR2000_G.jpg
The notes may not fit in with other Haiku icons and could be removed. I kind of
like them though.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31598 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Icon for Beacon by zuMi (I think Ryan had the idea), with many tweaks by
myself (new and simplified shaft with outline, beams are not cropped, better
shadow).
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31593 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Updated BeHappy icon
* Updated PoorMan icon
* Beacon draft (I don't think it fits so well with the rest of the icons)
* New CF LightBulb
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31554 a95241bf-73f2-0310-859d-f6bbb57e9c96
great Menu prefs icon. If the extra little "islands" seem extraneous they can be
removed easily. I figured the Yen symbol was an appropriate choice for the main
island.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31552 a95241bf-73f2-0310-859d-f6bbb57e9c96
hopefully it makes sense. It is definitely pushing it size-wise (997 bytes.) It
is based on an item in my house (I even set it up on my desk to draw it in
IOM.) If anyone wants to tweak it, feel free.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31497 a95241bf-73f2-0310-859d-f6bbb57e9c96
- version of makefile template increased to 2.3 because of adding RDEFS list in previous commit.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30936 a95241bf-73f2-0310-859d-f6bbb57e9c96
launching the console. Otherwise it will simply drop through to ejecting the CD
and rebooting as if the installer completed.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30885 a95241bf-73f2-0310-859d-f6bbb57e9c96
OptionalPackages. This makes the content definition part in
AlternativeGCCArchive superfluous.
* Moved the cc and c++ wrapper scripts from src/bin to data/bin.
* Added build variable HAIKU_ADD_OPTIONAL_PACKAGES to add optional packages
-- the list can be separated by slashes to allow easier passing through
the shell.
* When invoking the sub-jam that builds the alternative GCC archive, we force
it to ignore the UserBuildConfigs and we enable the optional packages
enabled in the main jam.
* Reorganized /boot/develop:
- There's now an "abi" subdirectory containing a <arch>/<gcc>/ subdirectory
for each installed ABI-incompatible gcc version and a "current" symlink
pointed to the currently selected one.
- All ABI-dependent directories under /boot/develop/ (lib/x86, headers/cpp,
tools/gnupro) symlink into /boot/develop/abi/current.
- Changed BELIBRARIES to contain
/boot/develop/abi/current/library-paths/common instead of /boot/common/lib.
The former is a symlink to either /boot/common/lib or
/boot/common/lib/<gccVersion>. There's also a respective "home" symlink.
- Repackaged the optional binutils+gcc 2/4 packages accordingly. Also fixed
the obsolete /boot/beos/system/lib/libstdc++.so symlink in the gcc 4
package.
- The new structure allows to switch between compilers by changing the
/boot/develop/abi/current symlink. Added script setgcc to do that.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30875 a95241bf-73f2-0310-859d-f6bbb57e9c96
symbols recently introduced. Until init_term_dyn.o is linked into kernel
add-ons, too, we link with haiku_version_glue.o, so we have those symbols
in kernel add-ons as well.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30818 a95241bf-73f2-0310-859d-f6bbb57e9c96
Ingo / Axel: please shout if the Advantage isn't correct - I could only test
with my Ergo Elan (the international version).
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30803 a95241bf-73f2-0310-859d-f6bbb57e9c96
- Added the server to Bootscript.
This closes ticket #3446.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30781 a95241bf-73f2-0310-859d-f6bbb57e9c96
always put new icons here first. Oliver, if you still have the original icons,
with named paths and shapes and so on, please put them here and replace the
ones I extracted from the binaries.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30562 a95241bf-73f2-0310-859d-f6bbb57e9c96
available space slightly better.
* Gave every icon object a name.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30554 a95241bf-73f2-0310-859d-f6bbb57e9c96
all Haiku vector icons ever made in this folder... :-)
The new generic app icon looks pretty cool (Haiku colors) and could replace
our current generic icon (broken link icon needs to be updated as well then),
feedback welcome.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30552 a95241bf-73f2-0310-859d-f6bbb57e9c96
feature and offer the user to boot into the Installer or into the Desktop (Live-CD
mode). Thanks to Vincent Duvert who offered a method that worked around some
interference from mysterious debug output...
The launching of the servers has been refactored, since that needs to be done anyways
before an alert can be shown.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30332 a95241bf-73f2-0310-859d-f6bbb57e9c96
* enable bash_completion loading in etc/profile. this fixes on the second part #2886.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30233 a95241bf-73f2-0310-859d-f6bbb57e9c96
Jef Poskanzer is providing the backend, but had to be adopted in some ways.
Other issues in Poorman have been resolved.
When testing the license integration, I stumbled over some AboutSystem bugs,
basically clicking licenses would not open them. I fixed those in this patch,
sorry for mixing that up.
Note to Ma Jie: I changed the encoding of the libhttpd files to UTF-8!
(This affects only the (C) glyph.) Thanks a lot for your awesome work on
Poorman, it's really appreciated!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29906 a95241bf-73f2-0310-859d-f6bbb57e9c96
At least, this system directory relayout show vividly that in many places we should use find_directory()
instead. Ironically, these ones can't but keep hardcoded paths, except if I've missed some
/bin/find_directory tool ;-)
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29892 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Made the TimeZoneView less error prone, and also actually use Haiku code (the
previous check didn't work since it used #if, not #ifdef).
* Also took the liberty to rename our boot loader to haiku_loader, since I had
to update the nasm binary anyway. Updated the assembly sources to nasm 2.0.
* I haven't found where the synth location in the MIDI code is specified,
though.
* Also, NetBootArchive, and FloppyBootImage haven't been updated yet. Will do
so next.
* Some optional packages still put their license to beos/etc/licenses. I didn't
update them yet, as we'll probably do so anyway at some point. Also, I think
we might want to introduce a common/data/licenses instead for those.
* If you encounter any problems, please tell!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29876 a95241bf-73f2-0310-859d-f6bbb57e9c96
files in /boot/home/config/boot. Thanks! Though eventually I'd like to have a
more intuitive method of adding start up applications.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29814 a95241bf-73f2-0310-859d-f6bbb57e9c96
which auto-generates dependencies. It was written by Lars Duening for BeOS
and uses libglob, which is also part of make. To re-use libglob and since
make is already part of the Haiku tree, I added mkdepend to the bin tools.
* Added Lars Duening's copyright to AboutSystem.
* Added skeleton makefile and makefile-engine to data/develop.
* Added mkdepend and makefile-engine files to the Development optional package.
It could be argued to move the make bin command there too, from it's current
location in the HaikuImage file. However, make could be useful to always
have available.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29609 a95241bf-73f2-0310-859d-f6bbb57e9c96
late, since it's great! I am not sure if he meant it for the add-on server,
or as default media_addon icon. But I think it's great for the add-on server!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29502 a95241bf-73f2-0310-859d-f6bbb57e9c96
* moved flag slightly for better crispness
Hope you don't mind, nice work, Francois!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28266 a95241bf-73f2-0310-859d-f6bbb57e9c96
* Slightly worked over the Image Editor icon to improve crispness at 16x16).
* The shadow of the pendrive could perhaps be improved.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28265 a95241bf-73f2-0310-859d-f6bbb57e9c96
