gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Code Issues Projects Releases Wiki Activity
900 Commits 23 Branches 15 Tags 16 MiB
Commit Graph

567 Commits

Author SHA1 Message Date
Camilla Berglund 7fb702a22b Removed unused code. 2012-03-25 20:45:06 +02:00
Camilla Berglund 2588c9be17 Renamed GLFW_BUILD_DLL to _GLFW_BUILD_DLL. 2012-03-25 17:40:30 +02:00
Camilla Berglund c097246312 Fixed listing of non-pkg-config libraries. 2012-03-25 17:34:21 +02:00
Camilla Berglund bd8eb1399a Put platform detection in a single place. 2012-03-25 16:51:24 +02:00
Camilla Berglund 20e685d37b Formatted variables not used outside of the local CMake project. 2012-03-25 16:49:15 +02:00
Camilla Berglund d743793e71 Pkg-config dependency generation fixes. 2012-03-25 14:51:56 +02:00
Camilla Berglund 7b46a184cb Added standard option to switch between static and dynamic library, dropped dynamic test. 2012-03-25 13:55:39 +02:00
Camilla Berglund 29d38c3b64 Increased Cocoa pixel format attribute array size. 2012-03-23 15:27:50 +01:00
Camilla Berglund c2a2114590 Fixed GCC warnings. 2012-03-22 23:30:00 +01:00
Camilla Berglund 8d2c2791c2 Added initial Linux MinGW-w64 support. 2012-03-22 16:57:38 +01:00
Camilla Berglund 812ad163eb Formatting. 2012-03-22 14:29:23 +01:00
Camilla Berglund 742299faaa Merged implementation for Win32. 2012-03-22 13:17:44 +01:00
Camilla Berglund 8109470e72 Merge branch 'master' into cursor-enter-leave 2012-03-22 12:06:00 +01:00
Camilla Berglund df1af5ca75 I am POSIXed. 2012-03-20 20:00:04 +01:00
Camilla Berglund c58750ef92 Applied fix for pixel format creation failure. 2012-03-20 15:30:46 +01:00
Camilla Berglund 61d4cf4f39 Merge branch 'master' of github.com:elmindreda/glfw 2012-03-20 15:24:23 +01:00
Camilla Berglund eb83a3e8f9 Replaced final deprecated Core Graphics call. 2012-03-20 15:23:35 +01:00
Camilla Berglund 21f2327e56 Formatting. 2012-03-10 16:23:09 +01:00
Camilla Berglund 5fd66f7d30 Free visual list earlier. 2012-03-07 18:38:08 +01:00
Camilla Berglund 339fb7d246 Made key code translation table private to function. 2012-03-07 15:13:41 +01:00
Camilla Berglund 89eec8af09 Made more consistent use of key code conversion. 2012-03-07 15:10:53 +01:00
Camilla Berglund 8155f90bf3 Formatting. 2012-03-07 15:04:14 +01:00
Camilla Berglund be547da9d2 Replaced more deprecated CoreGraphics calls. 2012-03-06 02:21:01 +01:00
Camilla Berglund 5f854b2bbf Replaced CFRelease with CGDisplayModeRelease. 2012-03-06 00:58:04 +01:00
Camilla Berglund a90675c526 Shortened the shortening. 2012-03-05 22:05:40 +01:00
Camilla Berglund 3383e59a73 Renamed function. 2012-03-05 20:30:59 +01:00
Camilla Berglund cb9bae5c71 Made glfwOpenWindow enforce the forward-compat and profile hints. 2012-03-05 20:27:47 +01:00
Camilla Berglund e55396d754 Shortened call to setAppleMenu:. 2012-03-05 20:09:06 +01:00
Camilla Berglund cc15dff98c Merge branch 'master' of github.com:elmindreda/glfw 2012-03-05 16:29:37 +01:00
Camilla Berglund 7af82fdade Replaced deprecated CoreGraphics calls in video mode enumeration. 2012-03-05 16:27:53 +01:00
Camilla Berglund c0db61bd6e Moved autorelease pool back to glfwInit. 2012-03-05 16:26:15 +01:00
Camilla Berglund f49119107f Removed misplaced Win32 configuration macros. 2012-03-01 03:45:06 +01:00
Camilla Berglund cd7b9b1568 CMake file formatting. 2012-02-29 20:15:39 +01:00
Camilla Berglund a82598ea24 Disable dynamic loading for Win32 DLL. 2012-02-29 19:52:34 +01:00
Camilla Berglund 98fbc07aa4 Fixed GLFW_WINDOW_NO_RESIZE state not being saved. 2012-02-27 02:21:26 +01:00
Camilla Berglund a202799f45 Renamed AppKit init function. 2012-02-26 03:24:42 +01:00
Hanmac 7e0ca6705b Added use of XkbKeycodeToKeysym when Xkb is available. 2012-02-23 21:51:57 +01:00
Camilla Berglund ea36557b93 Merge remote-tracking branch 'raedwulf/clipboard' into clipboard 
Conflicts:
	src/CMakeLists.txt
 2012-02-19 13:43:26 +01:00
Tai Chi Minh Ralph Eastwood 8b7fc5d601 Trailing whitespace. 2012-02-19 06:30:45 +00:00
Tai Chi Minh Ralph Eastwood 5937af089e Merge branch 'master' of github.com:raedwulf/glfw into clipboard 
Conflicts:
	src/CMakeLists.txt
	tests/CMakeLists.txt
 2012-02-19 06:29:48 +00:00
Tai Chi Minh Ralph Eastwood d561e3a0b0 Merge branch 'master' of github.com:raedwulf/glfw into clipboard 
Conflicts:
	tests/CMakeLists.txt
 2012-02-19 06:17:52 +00:00
Tai Chi Minh Ralph Eastwood a3430c2dec No idea why this file changed... or should it be changed at all. 2012-02-19 05:40:11 +00:00
Camilla Berglund 84ea69358f Removed unused variable, fixed chdir regression. 2012-02-15 01:57:43 +01:00
Camilla Berglund 4a9545317e Postponed AppKit init to first window creation. 2012-02-15 01:44:55 +01:00
Camilla Berglund e7f7c19de3 Made C-only modules C. 2012-02-15 01:20:27 +01:00
Camilla Berglund 65f55d03b1 Removed invalid timer set. 2012-02-15 01:11:16 +01:00
Camilla Berglund 7302f761d9 Cleaned up bundle resource directory logic, clarified comment. 2012-02-15 00:33:01 +01:00
Camilla Berglund f2062e06b7 Removed traces of Captain Obvious. 2012-02-09 16:31:01 +01:00
Camilla Berglund 13a438c91e Replaced NSDate time source with mach_absolute_time. 2012-02-09 01:53:26 +01:00
Camilla Berglund cd670c34a2 Fixed Alt+F4 not being translated into WM_CLOSE. 2012-02-07 16:56:06 +01:00
Camilla Berglund 0b34cb1466 Removed unused variable. 2012-02-07 16:21:37 +01:00
Camilla Berglund bba4a56352 Added missing return value. 2012-02-07 16:21:19 +01:00
Camilla Berglund ca9633247b Merge branch 'master' of github.com:elmindreda/glfw 
Conflicts:
	src/win32_window.c
 2012-02-07 15:43:29 +01:00
Camilla Berglund 0c3b1b5a0e Removed allocator. 2012-02-07 14:58:58 +01:00
Camilla Berglund f6dfaf50ad Formatting. 2012-02-05 16:56:26 +01:00
Camilla Berglund 32b07923ab Formatting. 2012-02-05 02:43:49 +01:00
Camilla Berglund fccef20b76 Added explicit WINVER, avoid redefining UNICODE. 2012-02-05 02:41:52 +01:00
Camilla Berglund 84579305cb Made string conversions globally available. 2012-02-05 02:07:50 +01:00
Camilla Berglund f582746aaa Merge branch 'utf8' 2012-02-04 02:17:19 +01:00
Camilla Berglund e937c86893 Added UTF-8 window title support for Cocooa. 2012-02-04 02:15:17 +01:00
Camilla Berglund fcae55591e Merge branch 'master' of github.com:elmindreda/glfw 2012-02-04 02:05:38 +01:00
Camilla Berglund ad55edf114 Merge branch 'master' into utf8 2012-02-04 01:55:46 +01:00
Camilla Berglund b997db3a8b Removed GLFWthreadmodel and glfwInitWithModels. 2012-02-04 01:38:00 +01:00
Camilla Berglund 609c008a19 Moved input mode functions to top. 2012-02-04 01:34:12 +01:00
Camilla Berglund 5a05da441d Formatting. 2012-02-04 00:52:13 +01:00
Camilla Berglund ce288a8939 Transformed glfwEnable/Disable/SetCursorMode into glfwGetInputMode/SetInputMode. 2012-02-04 00:51:35 +01:00
Camilla Berglund 9c0c2c6b08 Upgraded Win32 port to Unicode mode. 2012-02-03 20:34:24 +01:00
Camilla Berglund 06074bc698 Added support for _NET_WM_ICON_NAME. 2012-02-02 17:20:14 +01:00
Camilla Berglund 797e936311 Replaced XStoreName and XSetIconName with X*SetWMProperties. 2012-02-02 17:01:11 +01:00
Camilla Berglund 083380884b Removed declarations made superfluous by our glxext.h header. 2012-02-01 22:00:07 +01:00
Camilla Berglund 78c135606a Removed error made superfluous by our glxext.h header. 2012-02-01 18:38:06 +01:00
Camilla Berglund 87dfde34a9 Formatting. 2012-02-01 14:43:42 +01:00
Camilla Berglund a508d21961 Merge remote-tracking branch 'hanmac/utf8Title' into utf8 2012-02-01 14:28:42 +01:00
Camilla Berglund 05173690d0 Merge branch 'master' of github.com:elmindreda/glfw 2012-02-01 14:27:43 +01:00
Camilla Berglund 017e2b3483 Formatting and cleanup. 2012-02-01 00:48:29 +01:00
Hanmac 1be6f17c66 add _NET_WM_NAME to the hasEWMGH check 2012-02-01 00:10:17 +01:00
Camilla Berglund 42cf91a07c Fixed GLFW_KEY_GRAVE_ACCENT and GLFW_KEY_WORLD_1 on Cocoa. 2012-02-01 00:00:20 +01:00
Camilla Berglund b6c510c9d1 Split window and context creation into separate functions. 2012-01-31 17:53:19 +01:00
Camilla Berglund b016d642ab Comment fixes. 2012-01-31 15:27:15 +01:00
Hanmac 8e2f4cfb31 add setting an utf8 string to _NET_WM_NAME for x11 2012-01-31 12:14:59 +01:00
Camilla Berglund c4806b9532 Merged cursor enter/leave callbacks. 2012-01-30 22:59:38 +01:00
Camilla Berglund 1d2a9790c9 Only show cursor on leave in hidden mode. 2012-01-30 22:44:41 +01:00
Camilla Berglund 7e470518ba Formatting. 2012-01-30 22:32:14 +01:00
Camilla Berglund 1ddafc25a6 Moved new cursor input code to other cursor input code. 2012-01-30 22:30:40 +01:00
Hanmac 0b752b84c3 Added API and X11 implementation of cursor enter and leave callbacks. 2012-01-30 22:19:39 +01:00
Camilla Berglund fa17b7e616 Compatibility fixes. 2012-01-30 00:02:54 +01:00
Camilla Berglund 0cb77a31b6 Formatting. 2012-01-29 17:08:22 +01:00
Camilla Berglund 32f186e82d Made joystick array static. 2012-01-29 15:51:09 +01:00
Camilla Berglund ea8c7029a7 Formatting. 2012-01-29 15:41:06 +01:00
Camilla Berglund e26fd639f9 Disabled debug printing. 2012-01-29 15:39:35 +01:00
Camilla Berglund 58bb6b5288 Formatting. 2012-01-29 15:38:22 +01:00
Camilla Berglund 3ff48b5b47 Formatting. 2012-01-29 15:37:29 +01:00
Camilla Berglund 98173ece03 Removed calls to exit on joystick init failure. 2012-01-29 15:32:16 +01:00
Camilla Berglund a5b8c8db18 Replaced malloc and free with GLFW allocator. 2012-01-29 15:30:43 +01:00
Camilla Berglund e05f0c0f53 Formatting. 2012-01-29 15:30:01 +01:00
Camilla Berglund 2935652f48 Merge remote-tracking branch 'tikhomirov/osx_joystick' 
Conflicts:
	.gitignore
	src/cocoa_init.m
 2012-01-29 15:05:58 +01:00
Camilla Berglund e93ae44ee5 Formatting. 2012-01-24 18:28:37 +01:00
Camilla Berglund 8f3b21eb81 Merge branch 'master' of github.com:elmindreda/glfw 2012-01-20 02:24:17 +01:00
Camilla Berglund 1187c7da62 Ported the temporary cursor jitter fix from 2.7.3. 2012-01-20 02:23:27 +01:00
Camilla Berglund 57f9602b0e Removed speculation. 2012-01-18 21:13:06 +01:00
Camilla Berglund 1ca5391acd Removed trailing whitespace. 2012-01-18 21:12:34 +01:00
Camilla Berglund 6add995b06 Formatting. 2012-01-18 19:59:42 +01:00
Camilla Berglund d322fa1ab4 Added workaround for APIENTRY. 2012-01-18 18:44:28 +01:00
Camilla Berglund 379d0025ec Removed library name from version string to more closely match OpenGL format. 2012-01-18 18:15:28 +01:00
Camilla Berglund cde95f72c0 Made X extensions be adjacent in version string. 2012-01-18 18:13:31 +01:00
Camilla Berglund 129ef3f72a Added Xkb presence to version string. 2012-01-18 17:51:46 +01:00
Camilla Berglund 87f713a5e2 Added glfwInit exception comment. 2012-01-10 21:35:13 +01:00
Camilla Berglund 85982b2985 Removed Cygwin cross-compilation hacks. 2011-11-03 00:13:49 +01:00
Camilla Berglund 96267c8696 Formatting. 2011-11-02 17:34:27 +01:00
Camilla Berglund a18cd1b14c Renamed GLFW_WINDOW_NO_RESIZE to GLFW_WINDOW_RESIZABLE. 2011-11-02 16:56:34 +01:00
Camilla Berglund 2660b27cf3 Renamed internal cursor position in preparation of new API. 2011-10-13 15:20:59 +02:00
Camilla Berglund 3ebe9a4358 Mouse input fixes. 2011-10-13 14:07:52 +02:00
Camilla Berglund 30c43d60a5 Removed superfluous test. 2011-10-13 14:07:24 +02:00
Camilla Berglund 72ef537425 Added input function for window damage events. 2011-10-09 21:12:13 +02:00
Camilla Berglund de147988f2 Fixed editing mistakes. 2011-10-09 17:40:29 +02:00
Camilla Berglund 30ab9e2058 Moved input-related functions to input file. 2011-10-09 17:13:58 +02:00
Camilla Berglund d0840bdea1 Added more input functions to clarify internal API. 2011-10-09 17:10:40 +02:00
Camilla Berglund ec8ee0c6e7 Merge branch 'master' of github.com:elmindreda/glfw 2011-10-09 00:02:14 +02:00
Camilla Berglund 65f074d257 Formatting. 2011-10-08 23:57:03 +02:00
Camilla Berglund 1960d1ebb1 Added error setting for more cases of invalid tokens. 2011-10-08 23:41:30 +02:00
Camilla Berglund 970269cf3a Merge branch 'master' of github.com:elmindreda/glfw 2011-10-05 00:52:45 +02:00
Camilla Berglund 0322d8fba0 Made Win32 port build (functionality soon). 2011-10-05 00:47:39 +02:00
Camilla Berglund c18eda3a1a Added error messages. 2011-10-04 01:06:43 +02:00
Camilla Berglund 0544afeb06 It is a platform error. 2011-09-26 15:40:18 +02:00
Camilla Berglund 5999a40aaa Improved legibility. 2011-09-26 15:38:11 +02:00
Camilla Berglund 41fe14b5f8 Merge git://github.com/raedwulf/glfw 2011-09-25 16:10:06 +02:00
Tai Chi Minh Ralph Eastwood 5ac752d79d Set the current gamma ramp to original gamma ramp at start. 2011-09-25 15:00:08 +01:00
Camilla Berglund a98c66c8cb Added glext header explanation. 2011-09-22 14:15:07 +02:00
Camilla Berglund 02200c635e Added missing include. 2011-09-22 14:10:03 +02:00
Ralph Eastwood a2ffa80e82 Some reformatting with new X11 SelectionRequest event. 2011-09-22 12:09:01 +01:00
Ralph Eastwood 9f41e5b67a X11 copying code and support PRIMARY & CLIPBOARD clipboards. 2011-09-22 12:03:45 +01:00
Ralph Eastwood 57522db6e2 X11 implementation of clipboard pasting. 2011-09-21 15:43:28 +01:00
Ralph Eastwood 31c91545be Added clipboard stubs. 2011-09-21 10:09:47 +01:00
Camilla Berglund 6da82e0ffe Formatting. 2011-09-20 18:52:00 +02:00
Camilla Berglund 554bf5d321 Brought back non-relative gamma ramp generation. 2011-09-20 15:44:54 +02:00
Camilla Berglund 0d0951b7eb Merge branch 'cocoa-gamma' of git://github.com/raedwulf/glfw 2011-09-20 14:26:13 +02:00
Camilla Berglund eede75fe5e Added initial support for CLOCK_MONOTONIC. 2011-09-20 00:55:20 +02:00
Camilla Berglund df75a2dc2f Added missing error string. 2011-09-19 21:32:04 +02:00
Camilla Berglund dbfd59ee7e Comment clarification. 2011-09-19 21:29:02 +02:00
Camilla Berglund 4e9c34952c Pkg-config file generation work. 2011-09-19 18:46:20 +02:00
Sergey Tikhomirov 2357cf6f30 Added initial joystick support on OS X 2011-09-18 22:05:00 +03:00
Camilla Berglund d0af26cd43 Allow error callback to be set before glfwInit. 2011-09-16 01:16:31 +02:00
Tai Chi Minh Ralph Eastwood 53f64983a9 Take into account the original gamma before applying gamma. 2011-09-15 06:16:33 +01:00
Tai Chi Minh Ralph Eastwood 688772111d Initial implementation of gamma through Cocoa. 2011-09-12 22:16:28 +01:00
Camilla Berglund dbc9489f38 Fixed regression breaking the dlopen code path. 2011-09-07 14:37:09 +02:00
Camilla Berglund 194e865bd6 Don't duplicate extension preference logic. 2011-09-07 05:41:40 +02:00
Camilla Berglund 285ab537f7 Initial implementation of cursor mode on Cocoa. 2011-09-06 17:38:00 +02:00
Camilla Berglund 3b733b91bb Fixed header include paths. 2011-09-06 17:32:41 +02:00
Camilla Berglund ad973a5cfe Replaced hard-coded gamma ramp size with public constant. 2011-09-06 15:54:04 +02:00
Camilla Berglund 62f812873c Added gamma value error check. 2011-09-06 15:47:17 +02:00
Camilla Berglund ca0dbdbb6e Simplified glfwSetGammaFormula to glfwSetGamma. 2011-09-06 15:43:31 +02:00
Camilla Berglund 99712de710 Comment fix. 2011-09-06 14:52:42 +02:00
Camilla Berglund 30e362d435 Shortened native extension boolean names. 2011-09-06 14:51:03 +02:00
Camilla Berglund f08397a108 Made it an error to not define an entry point retrieval mechanism on X11. 2011-09-06 14:40:39 +02:00
Camilla Berglund 81cfc1001d Moved glext headers to separate directory for clarity. 2011-09-06 14:33:25 +02:00
Camilla Berglund 9ae8c778df Error message updates. 2011-09-06 14:28:28 +02:00
Camilla Berglund 39dc15f737 Corrected error message. 2011-09-06 13:56:05 +02:00
Camilla Berglund b1656d7323 Replaced GLFW_MOUSE_CURSOR enable with glfwSetCursorMode. 2011-09-06 13:55:29 +02:00
Camilla Berglund c32fa805d5 Merged bugfix from 2.7.3-pre. 2011-08-14 01:28:54 +02:00
Camilla Berglund 113bc94042 Formatting. 2011-08-14 01:27:48 +02:00
Camilla Berglund d24acb7f64 Copied Cocoa entry point bugfix from 2.7.2. 2011-07-27 18:40:41 +02:00
Camilla Berglund cfb9394c73 Copied OS X Lion GL3 support from 2.7.2. 2011-07-27 18:24:27 +02:00
Camilla Berglund c233e005a8 Copied context property readback from 2.7.1. 2011-07-27 18:20:15 +02:00
Camilla Berglund e4027f14d0 Rough line-wrapping pass. 2011-07-27 17:48:56 +02:00
Camilla Berglund 4afc67c1df Various Windows and VC++ 2010 fixes. 2011-07-27 17:09:17 +02:00
Camilla Berglund c1ab73b979 Renamed context-related functions to more closely match underlying APIs. 2011-07-27 16:01:27 +02:00
Camilla Berglund 673b42d8da Formatting. 2011-07-26 16:59:37 +02:00
Camilla Berglund 53f4f54c46 Flattened source tree. 2011-07-26 16:50:12 +02:00
Camilla Berglund 71f4adc3ec Formatting. 2011-05-21 23:13:48 +02:00
Camilla Berglund b2e8807440 Formatting. 2011-05-21 22:50:25 +02:00
Camilla Berglund f9e0f6f782 Formatting. 2011-05-21 17:34:17 +02:00
Camilla Berglund d25f9db752 Removed glfwGetGLVersion, added GLFW_OPENGL_REVISION. 2011-05-21 17:16:32 +02:00
Camilla Berglund 44035f5ef1 Added error check. 2011-05-08 16:29:33 +02:00
Camilla Berglund 8aa8b7c2e4 Added glfwCopyGLState. 2011-05-08 15:29:36 +02:00
Camilla Berglund f0ef9277ea C strictness fixes. 2011-04-06 20:38:55 +02:00
Camilla Berglund 1412732874 Fixed inverted gamma. 2011-04-01 12:46:03 +02:00
Camilla Berglund 22479e29b7 Removed superfluous comments. 2011-03-30 15:18:02 +02:00
Camilla Berglund 671b0f7803 Removed superfluous comments. 2011-03-30 15:07:44 +02:00
Camilla Berglund 849977c7b2 Allow closing of NULL. 2011-03-08 23:14:42 +01:00
Camilla Berglund d43e0b50d0 Added initial ARB_robustness support. 2011-03-07 20:51:34 +01:00
Camilla Berglund fe1db15d31 Formatting. 2011-03-07 14:58:10 +01:00
Camilla Berglund 19be24afb7 Moved more OpenGL logic to opengl.c. 2011-03-07 14:55:11 +01:00
Camilla Berglund d1d550d1ab Delayed window struct allocation. 2011-03-07 14:30:23 +01:00
Camilla Berglund 98eb79b7d9 Removed function made superfluous by window struct memset. 2011-03-07 14:24:55 +01:00
Camilla Berglund 17d9b5aa8f Comment tweak. 2011-03-07 14:16:39 +01:00
Camilla Berglund 0f481cb09d Renamed window hint reset function for clarity. 2011-03-07 14:16:31 +01:00
Camilla Berglund 3d82683177 Removed indirection made superfluous by introduction of cdecl. 2011-03-07 14:13:47 +01:00
Camilla Berglund ccbb956341 Added pluggable memory allocator and threading stub. 2011-03-07 14:09:13 +01:00
Camilla Berglund cf7819df8d Comment tweaks. 2011-03-07 13:58:02 +01:00
Camilla Berglund 596f56fe7b Moved OpenGL related function to opengl.c, minor formatting. 2011-03-07 13:56:28 +01:00
Camilla Berglund 0d50ee749f Added profile enum verification. 2011-03-06 13:28:10 +01:00
Camilla Berglund 6d7d11643a Clarified comment. 2011-03-06 12:18:22 +01:00
Camilla Berglund ee880bda1b Moved window input boolean to correct block. 2011-03-06 01:56:40 +01:00
Camilla Berglund 6e553c7376 Purged references to GLFW as a framework. 2011-03-06 01:46:39 +01:00
Camilla Berglund cfcc3da65f Removed macros provided by internal up-to-date glxext.h header. 2011-03-04 22:24:27 +01:00
Camilla Berglund 9b70cec954 Fixed bug #3093443. 2011-03-04 21:53:34 +01:00
Camilla Berglund f511fa0228 Comment updates. 2011-03-04 17:58:43 +01:00
Camilla Berglund 57eabfd17f Added more strictness to GL version check. 2011-03-04 17:51:12 +01:00
Camilla Berglund 5d2edb2dff Comment updates. 2011-03-04 17:49:36 +01:00
Camilla Berglund 2f7bfb89e4 Formatting. 2011-03-04 15:49:05 +01:00