skullydazed 
								
							 
						 
						
							
							
								
							
							
	
	
	e87c39d302 
 
						 
						
							
							
								
								
								More thoroughly document Bootmagic and Command ( #2455 )  
							
							
							
							
						 
						
							2018-03-02 09:21:03 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									skullY 
								
							 
						 
						
							
							
								
							
							
	e5c331e7be  
						 
						
							
							
								
								
								Fix the SGUI aliases  
							
							
							
							
						 
						
							2018-03-01 16:15:38 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									skullydazed 
								
							 
						 
						
							
							
								
							
							
	
	
	e3f67e6e7f 
 
						 
						
							
							
								
								
								Add SGUI() and SGUI_T() for consistency with KC_GUI ( #2442 )  
							
							... 
							
							
							
							
							* Add `SGUI()` as an alias of `SCMD()` for consistency with `KC_GUI`
* Add `SGUI_T()` as an alias of `SCMD_T()` for consistency with `KC_GUI`
* Make SGUI the primary name 
							
						 
						
							2018-03-01 08:13:10 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mitchell van Manen 
								
							 
						 
						
							
							
								
							
							
	31cae1f1bd  
						 
						
							
							
								
								
								Update feature_macros.md ( #2387 )  
							
							... 
							
							
							
							
							break statements are never reached due to the return statement, so unnecessary 
							
						 
						
							2018-03-01 08:05:15 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Choi 
								
							 
						 
						
							
							
								
							
							
	0092be5925  
						 
						
							
							
								
								
								adding my keymap ( #2443 )  
							
							
							
							
						 
						
							2018-03-01 07:51:57 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maarten Dekkers 
								
							 
						 
						
							
							
								
							
							
	381f4e6404  
						 
						
							
							
								
								
								Updated and added maartenwut's layouts ( #2444 )  
							
							
							
							
						 
						
							2018-03-01 07:51:11 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fauxpark 
								
							 
						 
						
							
							
								
							
							
	b713feb6f2  
						 
						
							
							
								
								
								Add a little aside explaining that shifted keys with mod-tap doesn't work ( #2446 )  
							
							
							
							
						 
						
							2018-03-01 07:49:50 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Orleans 
								
							 
						 
						
							
							
								
							
							
	d7f46f3466  
						 
						
							
							
								
								
								layout(preonic): dudeofawesome's layout ( #2449 )  
							
							... 
							
							
							
							
							* 🎉  duplicate default Preonic keymap
* ✨  add Workman layout
* 🚚  swap backspace and delete
* ✨  enable hold enter for shift
* 🚚  swap media play and next
* 💄  use Planck startup sound
* 💄  add Workman layer sound
* ✨  add numpad layer
* 💄  add new workman sound
* 📝  add README
* 🎨  fix layout formatting
* 📝  add image of numpad layer
* 📦  changing chibios submodule version
to match upstream/master's version
* ✨  add caps lock key on adjust layer
* ✨  reworking numpad layer to match a real numpad
* ✨  add double tap to activate numpad
* 📝  fix layout comments
* 📝  update numpad layer render
* ✨  adding operator keys to left hand on numpad
* 🎨  shorten numpad keycodes 
							
						 
						
							2018-03-01 07:48:15 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
							
							
	452d23da52  
						 
						
							
							
								
								
								Update to drashna keymaps and userspace ( #2450 )  
							
							... 
							
							
							
							
							* Add OSL keycodes and macro handling
* Re-add AVRDUDE target
* Userspace document cleanup and commenting
* Fix Orthodox keymap layout (cosmetic)
* Add caveat for KEYMAP Macros
* Minor tweaks
* Enable Bootmagic in Ergodox EZ
* Minor tweaks 
							
						 
						
							2018-03-01 07:46:57 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Choromanski 
								
							 
						 
						
							
							
								
							
							
	7f7f763598  
						 
						
							
							
								
								
								Fixed dead links ( #2451 )  
							
							... 
							
							
							
							
							* Fixed typo of 'confid.h' to 'config.h'
* Fixed broken links in docs
* Fixed a lot of dead links 
							
						 
						
							2018-03-01 07:45:47 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gam3cat 
								
							 
						 
						
							
							
								
							
							
	2b8a82fb9d  
						 
						
							
							
								
								
								M10-A, M65-A, GonNerd keymaps ( #2418 )  
							
							... 
							
							
							
							
							* adding my keymap
* update keymap
* adding gamecat keymap for jc65 keyboard
* updating jc65-gamecat keymap
* updating jc65-gamecat keymap
* updating jc65-gamecat keymap
* updating jc65-gamecat keymap
* M10a keymap and M65a updates
* keymap updates
* keymap updates
* M10a/M65a keymap updates
* M10a/M65a keymap updates
* Delete test.txt
* M65 keymap update
* M65 keymap update
* M65 keymap update
* M65/M10 keymap updates
* M65 keymap update
* M65 keymap update
* M65 keymap update
* M65 keymap update
* M65 keymap update
* M65/M10 keymap update
* M65 keymap update
* M65 keymap update
* M65 keymap update
* M65 keymap update
* M65 keymap update
* Set theme jekyll-theme-cayman
* Set theme jekyll-theme-slate
* M65 keymap update
* M10a/M65a keymap updates
* M10a keymap update
* M65a keymap update
* M65a keymap update
* M65a keymap update
* M65a readme update
* M65a/M10a updates
* M65a readme updates
* M65a/M10a updates
* M65A update
* M65A update
* M65A update
* M65A update
* M65A/M10A keymap update
* M10A keymap update
* Set theme jekyll-theme-tactile
* M10A keymap update
* M65A keymap.c update
* M65 keymap added LED backlight toggle, inc/dec to adjust layer.
* M65 keymap/readme updates.
* M65 keymap fix
* M65 keymap update
* remove theme
* fix comments/readme
* update keymap
* LED backlight update, guess based on reading atmega32u4 documentation for DDRB/PORTB regs, believe DDRB should only be written to once not every time CAPS is hit, but really not too sure.
* LED backlight update, guess based on reading atmega32u4 documentation for DDRB/PORTB regs, believe DDRB should only be written to once not every time CAPS is hit, but really not too sure.
* M65 keymap update
* Updated M65, M10, and gonNerd keymaps.
* update
* del
* keymap updates M65, M10, gonnerd
* update keymaps
* adding back readme that somehow got removed. 
							
						 
						
							2018-02-28 16:44:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Brian Choromanski 
								
							 
						 
						
							
							
								
							
							
	8e99fbc884  
						 
						
							
							
								
								
								Fixed typo of 'confid.h' to 'config.h' ( #2448 )  
							
							... 
							
							
							
							
							* Fixed typo of 'confid.h' to 'config.h'
* Fixed broken links in docs 
							
						 
						
							2018-02-28 16:43:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Danny 
								
							 
						 
						
							
							
								
							
							
	524053e3c0  
						 
						
							
							
								
								
								Remap msys2 usb, fix USB port detection ( #2301 )  
							
							... 
							
							
							
							
							* Add AVRDUDE to MSYS2 setup
* Remap detected USB port in MSYS2 to COM port 
							
						 
						
							2018-02-28 16:40:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Gorman 
								
							 
						 
						
							
							
								
							
							
	19b02bf267  
						 
						
							
							
								
								
								Merge of e6v2 stuff as well as my personal keymaps ( #2434 )  
							
							... 
							
							
							
							
							* Checkin of tada keymap and initial commit for e6v2.
* checking in other remaining changes before trying to merge
* Reverting pin change. This was done based on the json orginally provided by exclusive, but it was later determined my map was the correct one based on user testing
* fix extra key for ansi keymap. Didn't include fn as standard ansi shift is not split but still had it in keymap
* Fix default help file and add reset to default 
							
						 
						
							2018-02-28 16:22:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									skullY 
								
							 
						 
						
							
							
								
							
							
	298ac18dfa  
						 
						
							
							
								
								
								remove duplicate #define  
							
							
							
							
						 
						
							2018-02-25 17:41:43 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									skullY 
								
							 
						 
						
							
							
								
							
							
	c6ce959f49  
						 
						
							
							
								
								
								Test a shrug macro  
							
							
							
							
						 
						
							2018-02-25 17:40:18 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yan-Fa Li 
								
							 
						 
						
							
							
								
							
							
	3b801880a0  
						 
						
							
							
								
								
								Custom keymap for clueboard 60  
							
							... 
							
							
							
							
							My customized keymap for the clueboard 60.
 - Maps MT(LCTL,ESC) to Caps lock
 - Swaps ALT and GUI for OSX
 - Adds layer for WASD key navigation 
							
						 
						
							2018-02-23 13:25:23 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alejandro Blanco 
								
							 
						 
						
							
							
								
							
							
	21a37a5245  
						 
						
							
							
								
								
								ErgoDox layout similar to Truly Ergonomic  
							
							
							
							
						 
						
							2018-02-23 13:23:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean-Li Murmann 
								
							 
						 
						
							
							
								
							
							
	3cff95c8df  
						 
						
							
							
								
								
								new customized ErgodoxEz keymap with easy to remember modifiers. ( #2400 )  
							
							... 
							
							
							
							
							* First pass keyboard setup!
* More variation
* Final layer for today
* Added brace to middle key 
							
						 
						
							2018-02-23 13:22:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Isaac Hookom 
								
							 
						 
						
							
							
								
							
							
	93eabc4b2c  
						 
						
							
							
								
								
								new xd60 layout ( #2405 )  
							
							... 
							
							
							
							
							* new xd60 layout
* fix kc_slsh 
							
						 
						
							2018-02-23 13:22:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ajp10304 
								
							 
						 
						
							
							
								
							
							
	01f91bf6f4  
						 
						
							
							
								
								
								JJ40 AJP10304 layout ( #2407 )  
							
							... 
							
							
							
							
							* JJ40 AJP10304 layout
Updated AJP10304 readme.md with formatting
* Revert default JJ40 keymap 
							
						 
						
							2018-02-23 13:21:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Wamsley 
								
							 
						 
						
							
							
								
							
							
	2c1ba03a98  
						 
						
							
							
								
								
								Add additional 'tada68' layout.  
							
							
							
							
						 
						
							2018-02-23 13:17:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lucwastiaux 
								
							 
						 
						
							
							
								
							
							
	27d32378b5  
						 
						
							
							
								
								
								Update Dvorak 42 key layouts ( #2420 )  
							
							... 
							
							
							
							
							* add SCREEN_NAV layer for copy/pasting within screen
* working readreg/paste macros
* working read reg / paste macros
* write log and tran patterns, and expand
* add ls -la shortcut, add tab on combined layer
* put delete word on the right pinky key on shell_nav layer
* add TAB on the right side, add reset key
* added Cloud9 macros
* add cloud9 shortcuts to atreus layout
* added BROWSER_CONTROL layer
* finalized browser control layer
* adding comment 
							
						 
						
							2018-02-23 13:16:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scott-t-wilson 
								
							 
						 
						
							
							
								
							
							
	3f3d0551cd  
						 
						
							
							
								
								
								Lfkeyboards updates ( #2421 )  
							
							... 
							
							
							
							
							* Update smk65 fn layer, add iso
* Added Fn layer to ISO keymap
* Fix error when backlight is disabled but lighting isn't
* Remove broke mini1800 iso map
* Add keymaps
* Add LFKPad
* Add split delete to lfk78
* Typo
* Custom keymap 
							
						 
						
							2018-02-23 13:16:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Graham P Heath 
								
							 
						 
						
							
							
								
							
							
	f746174874  
						 
						
							
							
								
								
								Graham's Keymaps. ( #2422 )  
							
							... 
							
							
							
							
							* add my config
* fix backlight, clean up that code
* group background code, restore static var
* qwerty is supposed to be in the middle
* wrap layer change backlight in ifdef
* backlight levels and some more 'emojis'.
* Restructure to make it possible to press cmd ent on the right side of the board with one hand.
* Expose the period through the number layer. Add Hyper keys to mouse layer
* reduce mouse speed
* add a : -P  key
* Thumbs up and down, remove some keys that are duplicated via function keys, clean up
* fix build issues
* add various emoji
* duplicate default Meira keymaps
* Miera updates
* add documented but unmapped emoji
* Sound for the Meira, was stumped by a file size! Thanks drashna!
* add docs
* docs
* revert lib changes...
* clean up
* clean up
* remove make file
* Fixes missing key 
							
						 
						
							2018-02-23 13:15:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yan-Fa Li 
								
							 
						 
						
							
							
								
							
							
	a8daf3ffba  
						 
						
							
							
								
								
								Document bootmagic hot keys  
							
							... 
							
							
							
							
							- covers most of tmk_core/common/bootmagic.h 
							
						 
						
							2018-02-23 13:14:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									wanleg 
								
							 
						 
						
							
							
								
							
							
	3b4d26e344  
						 
						
							
							
								
								
								flashing instructions, keymap changes  
							
							... 
							
							
							
							
							* added flashing instructions for Linux & Windows
* minor keymap changes 
							
						 
						
							2018-02-23 13:14:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ferbie 
								
							 
						 
						
							
							
								
							
							
	767f7a8cf0  
						 
						
							
							
								
								
								Fixed formatting for Fedora example  
							
							
							
							
						 
						
							2018-02-23 13:13:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									deadencryption 
								
							 
						 
						
							
							
								
							
							
	ee176f2b27  
						 
						
							
							
								
								
								Adds dead encryption keymap  
							
							
							
							
						 
						
							2018-02-23 13:13:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mason McAllaster 
								
							 
						 
						
							
							
								
							
							
	c72c1db68b  
						 
						
							
							
								
								
								Planck/NIU_Mini - Mason Layout - Fixing comments, adding missed keys  
							
							
							
							
						 
						
							2018-02-23 13:12:27 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									James Shackleford 
								
							 
						 
						
							
							
								
							
							
	d469aaa166  
						 
						
							
							
								
								
								tada68: layout: add new layout 'tshack' ( #2431 )  
							
							... 
							
							
							
							
							* Move to a more cross-platform grep command
* Use sed to strip out AVR_SIZE instead
* tada68: layout: add new layout tshack
Adds "James Shackleford's UNIX layout" for the Tada68 
							
						 
						
							2018-02-23 13:12:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jose Pablo Mora 
								
							 
						 
						
							
							
								
							
							
	d54de1c5f2  
						 
						
							
							
								
								
								ergobox -> ergodox  
							
							
							
							
						 
						
							2018-02-23 13:11:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Hilburn 
								
							 
						 
						
							
							
								
							
							
	8df2ee4ec3  
						 
						
							
							
								
								
								Minor updates to docs ( #2406 )  
							
							... 
							
							
							
							
							* [docs/] Cleaning up some language to make it more clear.
* [docs/] Adding instructions for installing deps on RH / Fedora. 
							
						 
						
							2018-02-19 14:09:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Barnachea 
								
							 
						 
						
							
							
								
							
							
	0e92d99cdc  
						 
						
							
							
								
								
								Readme img link updates ( #2410 )  
							
							... 
							
							
							
							
							* QMK and JC65 pcb img links updated
link fixes
* personal keymap updates
new v32u4 keymap, updated v32a keymap
* Update readme.md 
							
						 
						
							2018-02-19 14:07:59 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Danny 
								
							 
						 
						
							
							
								
							
							
	3d92b21a3b  
						 
						
							
							
								
								
								Update dilly default keymap ( #2413 )  
							
							... 
							
							
							
							
							* Move DEL to correct layer
* Move BNM to the left by one and move Backspace, add more stuff to layers 
							
						 
						
							2018-02-19 13:50:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rempired 
								
							 
						 
						
							
							
								
							
							
	78f5a2a3dc  
						 
						
							
							
								
								
								1up60rgb Keyboard Support ( #2404 )  
							
							... 
							
							
							
							
							* Add files via upload
* Update keymap.c
* Update keymap.c
* Update 1up60rgb.c
* Tidy up the code a bit for submission into QMK Master
- Create readme file
- Fix compile issue with standard keymap
- Create default keymap
- Remove unused Makefile
* Keymap Adjustments
* Reworked alternate layouts
* Reworked keymaps
* Update keymap.c
* Update readme.md
Add carriage return to make README cleaner 
							
						 
						
							2018-02-18 02:09:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Danny Nguyen 
								
							 
						 
						
							
							
								
							
							
	f67c59aa7b  
						 
						
							
							
								
								
								Move hexwire layout into 4x12 layout folder  
							
							
							
							
						 
						
							2018-02-18 02:04:56 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Danny Nguyen 
								
							 
						 
						
							
							
								
							
							
	2a5da62728  
						 
						
							
							
								
								
								Add Dilly keyboard  
							
							
							
							
						 
						
							2018-02-18 02:04:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									GlenPickle 
								
							 
						 
						
							
							
								
							
							
	d1ea398fb9  
						 
						
							
							
								
								
								Added Chimera LS and Chimera Ergo ( #2335 )  
							
							... 
							
							
							
							
							* Added Chimera Ortho keymap
* added readme
* fixed hardware link
* Added KC_KEYMAP
* resolving conflict
* Added Chimera LS and Chimera Ergo
* Added rules file
* fixed rule files
* Added Chimera Ortho keymap
* Added KC_KEYMAP
* Added Chimera LS and Chimera Ergo
* fixed rule files
* fixed rule files
* fixed image links
* Added KC_KEYMAP
* Added Chimera LS and Chimera Ergo
* Added Chimera Ortho keymap
* fixed rule files
* fixed rule files
* fixed image links
* Fixed KEYMAP vs KC_KEYMAP 
							
						 
						
							2018-02-16 12:03:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yan-Fa li 
								
							 
						 
						
							
							
								
							
							
	bfc2b1205a  
						 
						
							
							
								
								
								u/yanfali custom keymap for Iris  
							
							... 
							
							
							
							
							Based heavily on the keymap by hexwire.
 1. Moved LALT to LCTL; I don't need CTL because of ESCC.
 1. Moved RAISE to old LALT.
 1. Moved ENTER to old RAISE.
 1. Move QUOTE to old ENTER.
 1. Moved PLUS to old QUOTE.
 1. replaced music next and volume up with browser forward and back
    through history 
							
						 
						
							2018-02-16 12:02:33 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pittyolo 
								
							 
						 
						
							
							
								
							
							
	7b5c6a895e  
						 
						
							
							
								
								
								Update keymap.c  
							
							
							
							
						 
						
							2018-02-16 12:02:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									tameone 
								
							 
						 
						
							
							
								
							
							
	4f55a7aca1  
						 
						
							
							
								
								
								Iris: Create info.json  ( #2396 )  
							
							... 
							
							
							
							
							* Create info.json
* Update info.json 
							
						 
						
							2018-02-16 12:01:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
							
							
	b0e8de1c97  
						 
						
							
							
								
								
								Fix EE HANDS on splits losing handedness if RGB is enabled ( #2399 )  
							
							... 
							
							
							
							
							* Fix EE HANDS on splits losing handedness if RGB is enabled
* Because I'm an idiot and did a bad cut/paste job 
							
						 
						
							2018-02-16 12:00:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ChrissiQ 
								
							 
						 
						
							
							
								
							
							
	1af8f1f201  
						 
						
							
							
								
								
								Let's Split: Minor keymap fixes  
							
							
							
							
						 
						
							2018-02-16 12:00:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Oryhara 
								
							 
						 
						
							
							
								
							
							
	b89e318d35  
						 
						
							
							
								
								
								adding my stuff back after hard reset  
							
							
							
							
						 
						
							2018-02-12 16:37:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Johan Ju 
								
							 
						 
						
							
							
								
							
							
	20b5dd80bd  
						 
						
							
							
								
								
								Fix swedish NO_GRV  
							
							
							
							
						 
						
							2018-02-12 15:56:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	25c7533092  
						 
						
							
							
								
								
								Change the CDC_NOTIFICATION_EPSIZE back to 8 from 32  
							
							
							
							
						 
						
							2018-02-12 15:48:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Fred Sundvik 
								
							 
						 
						
							
							
								
							
							
	50038882e0  
						 
						
							
							
								
								
								Set unused USB serial buffer to 1 byte to save memory  
							
							
							
							
						 
						
							2018-02-12 15:48:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Drashna Jaelre 
								
							 
						 
						
							
							
								
							
							
	6f5e88277b  
						 
						
							
							
								
								
								Update to drashna keymaps ( #2381 )  
							
							... 
							
							
							
							
							* Add to list of predefined rgb colors
* Change layer colors, to reflect new options
* Use Tag Toggle instead
* Clean up macros and add breathing indication for OSM Layer
* Get Viteri Macropad working properly
* Disable unused action features
* Use I2C because that's smaller, apparently
* Remove viterbi-half code 
							
						 
						
							2018-02-12 15:46:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gomme_Bidule 
								
							 
						 
						
							
							
								
							
							
	63df056013  
						 
						
							
							
								
								
								Update feature_auto_shift.md  
							
							
							
							
						 
						
							2018-02-12 15:45:54 -05:00