Commit graph

1349 commits

Author SHA1 Message Date
dfighter1985
1fccbbf351 CHANGED: #1471 the GUI library starts up from the GUI editor, altough can't exactly say yet that it works. 2012-07-14 03:57:23 +02:00
dfighter1985
9e9399a592 CHANGED: #1471 Merged latest gui-refactoring changes. 2012-07-14 02:04:09 +02:00
dfighter1985
5f49fab257 CHANGED: #1471 Apparently it's a bad idea for NLMISC to depend on a global in Ryzom client, since then it cannot be linked with other binaries. 2012-07-14 01:46:22 +02:00
dfighter1985
d888ecccdf CHANGED: Merged the latest changes of gui-refactoring branch 2012-07-13 06:29:25 +02:00
dfighter1985
f2c3c55bde CHANGED: #1471 CInterfaceParser is now a component of CWidgetManager, and is instantiated by an abstract factory method. (IParser::createParser()) 2012-07-13 05:37:09 +02:00
dfighter1985
3e5137810b CHANGED: #1474 CInterfaceManager is no longer a subclass of CInterfaceParser, instead CInterfaceParser is a component of CInterfaceManager. 2012-07-12 21:39:51 +02:00
dfighter1985
c9692cfc05 CHANGED: #1471 Moved some Lua related code from CInterfaceManager to CLuaManager and CInterfaceParser. 2012-07-12 09:01:35 +02:00
dfighter1985
7e8e21e2f6 CHANGED: #1471 Moved CProcedure code to it's own files, and also moved the procedure handling code from CInterfaceManager to CWidgetManager. 2012-07-12 05:29:33 +02:00
dfighter1985
b2ee4d275c CHANGED: #1471 Moved some more GUI code from CInterfaceManager to CWidgetManager. 2012-07-11 22:27:22 +02:00
dfighter1985
6506989e14 CHANGED: #1471 Moved the input event handling code from CInterfaceManager to CWidgetManager. 2012-07-11 06:44:34 +02:00
dfighter1985
86302f6a39 CHANGED: #1471 Moved the widget drawing code from CInterfaceManager to CWidgetManager, so the GUI library can now draw the widgets! 2012-07-10 23:01:09 +02:00
dfighter1985
27953ec7e8 CHANGED: #1471 Moved the contexthelp drawing/controlling code to the GUI library. 2012-07-10 06:25:15 +02:00
dfighter1985
e97ec6788e CHANGED: #1471 CInterfaceParser is now part of the Nel GUI library and is under the NLGUI namespace. 2012-07-09 03:45:00 +02:00
dfighter1985
4ed62dc1c4 CHANGED: #1471 Classes derived from CInterfaceOptions are now instantiated using a factory. 2012-07-08 01:56:49 +02:00
dfighter1985
28288d2543 CHANGED: #1471 Moved CSheetSelectionGroup and CSheetSelection to the GUI library. 2012-07-07 20:38:45 +02:00
dfighter1985
c641c67c8e ADDED: #1471 Qt property browser, for browsing and editing the selected widget's properties ( this is an empty shell as well for now ) 2012-07-07 05:01:32 +02:00
dfighter1985
aa352b2f30 ADDED: #1471 Created ActionEditor, LinkEditor, ProcEditor, WidgetHierarchy dialogs for the GUI editor, altough obviously they are just an empty shell for now. http://www.youtube.com/watch?v=nOhlliU6tCE 2012-07-06 06:10:20 +02:00
dfighter1985
042e9e0000 CHANGED: #1471 Widget definition inheritance is now supported in the GUI editor. www.youtube.com/watch?v=VG_TnZiGjBk 2012-07-06 03:15:15 +02:00
dfighter1985
30eef5ddef CHANGED: #1471 Little bit of refactoring, moved the parser code from GUIEditorWindow to a new class CWidgetPropParser. 2012-07-05 08:18:33 +02:00
dfighter1985
7538396dbe CHANGED: #1471 Ups, forgot to commit the example XML files. 2012-07-05 07:30:41 +02:00
dfighter1985
27fd3ae633 CHANGED: #1471 The GUI widget properties are now read from the GUI XML files ( widget inheritance is not yet supported ). 2012-07-05 07:22:28 +02:00
dfighter1985
a04280c7ef ADDED: #1471 The first GUI editor widget, with some test data. Altough it's for verification purposes only, so later it will be removed. http://www.youtube.com/watch?v=CpcUp1RcsMQ 2012-07-04 06:27:40 +02:00
dfighter1985
0b01fec846 Merged gui-refactoring into gsoc2012-gui-editor 2012-07-02 22:49:24 +02:00
dfighter1985
e24cffa79f Merged default branch into gui-refactoring. 2012-07-02 22:46:08 +02:00
dfighter1985
5a76ae7b38 CHANGED: #1471 Moved the basic interface expression user functions into the NELGUI library under the NLGUI namespace. 2012-07-02 05:07:13 +02:00
dfighter1985
363bb731c7 CHANGED: #1471 CViewPointer is now part of the NELGUI library and is under the NLGUI namespace. 2012-07-02 03:21:42 +02:00
dfighter1985
923695fe70 CHANGED: #1471 Broke up CViewPointer into a generic and a Ryzom game related class. 2012-07-02 02:50:47 +02:00
dfighter1985
66293a4fd9 CHANGED: #1471 CInterfaceTrack and CInterfaceAnim are now part of the NELGUI library and are under the NLGUI namespace. 2012-07-01 04:13:24 +02:00
dfighter1985
bf624b79ec CHANGED: #1471 CGroupHTML, CGroupParagraph, CViewLink are now part of the NELGUI library and are under the NLGUI namespace. 2012-07-01 03:11:24 +02:00
dfighter1985
31c887ede8 CHANGED: #1471 Decoupled CGroupHTML, CGroupParagraph, CViewLink from Ryzom game related code. 2012-06-30 05:58:02 +02:00
dfighter1985
215f7124d2 CHANGED: #1471 CGroupTable and CGroupCell are now part of the NELGUI library and are under the NLGUI namespace. 2012-06-29 06:58:14 +02:00
dfighter1985
e209a6c77d CHANGED: #1471 CGroupTable and CGroupCell no longer depend on CInterfaceManager, and a Ryzom game global. 2012-06-29 06:15:56 +02:00
dfighter1985
0c8698d7f0 CHANGED: #1471 CDBGroupComboBox is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-29 02:57:29 +02:00
kaetemi
e0da8b7f56 Fixed: Valgrind warnings 2012-06-28 11:30:58 +02:00
kaetemi
0d4f6da330 Fixed: Valgrind warnings 2012-06-28 11:08:36 +02:00
dfighter1985
17c499ef17 CHANGED: #1471 CDBGroupSelectNumber is now part of the NELGUI library and is under the NLGUI namespace. Also had to add a workaround so that the linker doesn't drop the seemingly unused code from the library. Thanks goes to Kaetami for that! 2012-06-28 11:06:36 +02:00
dfighter1985
b5c4ad14da CHANGED: #1471 CDBViewQuantity is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-28 07:35:11 +02:00
dfighter1985
c1f7df59d7 CHANGED: #1471 CDBViewNumber is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-28 07:16:15 +02:00
dfighter1985
5afbf1615a CHANGED: CDBViewDigit is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-28 07:07:44 +02:00
dfighter1985
2f0a724cd7 CHANGED: #1471 CDBViewBar3 is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-24 04:51:30 +02:00
dfighter1985
cdb0c5b6c5 CHANGED: #1471 CDBViewBar is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-24 04:30:12 +02:00
dfighter1985
854e269ae6 CHANGED: CGroupHeader is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-24 04:08:15 +02:00
dfighter1985
308fa1d0ea CHANGED: CGroupTab and CCtrlTabButton are now part of the NELGUI library and are under the NLGUI namespace. 2012-06-24 03:53:15 +02:00
dfighter1985
bb32f759c1 CHANGED: #1471 CViewTextMenu, CGroupSubMenu, CGroupMenu are now part of the NELGUI library and are under the NLGUI namespace. 2012-06-23 22:38:10 +02:00
dfighter1985
67f71ddf15 CHANGED: #1471 CViewTextMenu, CGroupSubMenu, CGroupMenu no longer depend on CInterfaceManager and CInterfaceParser. 2012-06-23 22:04:33 +02:00
dfighter1985
82e2759971 CHANGED: #1471 CGroupScrollText is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-23 21:24:48 +02:00
dfighter1985
bdf9c2b7ba CHANGED: #1471 CGroupContainer is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-23 07:21:32 +02:00
dfighter1985
2b4298b269 CHANGED: #1471 CGroupContainer no longer depends on CInterfaceManager, CViewPointer and the Ryzom game client time values. 2012-06-23 06:24:09 +02:00
dfighter1985
d7ea450e20 CHANGED: #1471 Moved some code from interface_options_ryzom to interface_options ( needed for CGroupContainer ) 2012-06-23 04:23:52 +02:00
dfighter1985
02227edb58 CHANGED: #1471 CGroupEditBox is now in the NELGUI library and is under the NLGUI namespace. 2012-06-23 03:27:49 +02:00
dfighter1985
2da27bdc2d CHANGED: #1471 CGroupEditBox no longer depends on CGroupContainer, and CInputHandlerManager. 2012-06-22 23:17:55 +02:00
dfighter1985
ab8b296adc CHANGED: #1471 CGroupList is now part of NELGUI library, and is under NLGUI namespace. 2012-06-22 06:48:19 +02:00
dfighter1985
e131c0f837 CHANGED: #1471 CGroupTree is now part of NELGUI library, and is under NLGUI namespace. 2012-06-22 05:37:55 +02:00
dfighter1985
8c93416909 CHANGED: #1471 CGroupTree no longer depends on CGroupContainer. 2012-06-22 05:13:05 +02:00
dfighter1985
2fcef29aa3 CHANGED: #1471 CViewBitmapCombo is now part of NELGUI library, and is under NLGUI namespace. 2012-06-22 04:40:34 +02:00
dfighter1985
547bd65160 CHANGED: #1471 CViewBitmapCombo no longer depends on CViewPointer. 2012-06-22 04:27:53 +02:00
dfighter1985
b7dc46ed8b CHANGED: #1471 CViewBitmap is now part of NELGUI library, and is under NLGUI namespace. 2012-06-22 03:49:43 +02:00
dfighter1985
0370f77424 CHANGED: #1471 CViewBitmap no longer depends on CGroupContainer. 2012-06-21 23:05:12 +02:00
dfighter1985
1854b8e33a CHANGED: #1471 CCtrlTextButton is now part of NELGUI library, and is under NLGUI namespace. 2012-06-21 22:20:02 +02:00
dfighter1985
2b12907293 CHANGED: #1471 CCtrlTextButton no longer depends on CGroupContainer. 2012-06-21 21:28:13 +02:00
dfighter1985
80cc60118a CHANGED: #1471 CViewTextIDFormated is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-21 20:31:10 +02:00
dfighter1985
1594ec45f8 CHANGED: #1471 CViewTextIDFormated no longer depends on Ryzom game related code. 2012-06-21 20:21:01 +02:00
dfighter1985
9503f2aaae CHANGED: #1471 CViewTextFormated is now part of NELGUI library, and is under the NLGUI namespace. 2012-06-21 10:32:46 +02:00
dfighter1985
ed9c2c84ec CHANGED: #1471 CViewTextID is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-21 07:18:25 +02:00
dfighter1985
69068877fc CHANGED: #1471 CGroupWheel is now in NELGUI library and is under the NLGUI namespace. 2012-06-17 21:21:20 +02:00
dfighter1985
b244a05cf1 CHANGED: #1471 CViewText is now part of NELGUI library and is under the NLGUI namespace. 2012-06-17 02:49:00 +02:00
dfighter1985
4e67289d6d CHANGED: #1471 CViewText no longer depends on CInterfaceManager. 2012-06-17 02:08:21 +02:00
dfighter1985
396abe14cf CHANGED: #1471 decoupled CViewText from CGroupContainer and CCtrlResizer. 2012-06-16 23:03:29 +02:00
dfighter1985
f8df1159ff CHANGED: #1471 moved some ucstring handling code to the NELGUI library ( required for CViewText ) 2012-06-16 22:21:14 +02:00
dfighter1985
e28e452649 CHANGED: #1471 CViewPolygon is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-16 21:05:16 +02:00
dfighter1985
6115a122c9 CHANGED: #1471 CViewQuad is now part of the NELGUI library and is under the NLGUI namespace. 2012-06-16 20:53:58 +02:00
dfighter1985
c560575a56 CHANGED: #1471 CCtrlTooltip is now in the NELGUI library and is under NLGUI namespace. 2012-06-16 04:16:12 +02:00
dfighter1985
eed17cc4f4 CHANGED: #1471 CCtrlColPick is now in the NELGUI library and is under NLGUI namespace. 2012-06-16 03:39:23 +02:00
dfighter1985
3933bd73d3 CHANGED: #1471 CCtrlPolygon is now in the NELGUI library and is under NLGUI. 2012-06-16 02:55:19 +02:00
dfighter1985
3929588a04 CHANGED: #1471 CCtrlQuad is now in the NELGUI library under the NLGUI namespace. 2012-06-16 02:34:07 +02:00
dfighter1985
4bde602411 CHANGED: #1471 CCtrlScroll is now part of NELGUI, and is under the NLGUI namespace. Also added a new class CGroupSubMenuBase. 2012-06-16 02:06:53 +02:00
dfighter1985
892a8131ca CHANGED: #1471 CCtrlButton is now under the NLGUI namespace. 2012-06-16 00:49:40 +02:00
dfighter1985
84fe4773fb CHANGED: #1471 CCtrlButton is now part of the NEL GUI library. 2012-06-16 00:23:20 +02:00
dfighter1985
8226c2b897 CHANGED: #1471 CCtrlBaseButton is now part of the NLGUI namespace. 2012-06-15 23:30:27 +02:00
dfighter1985
c57c909ed7 CHANGED: #1471 CCtrlBaseButton is now part of the NELGUI Library. 2012-06-15 22:40:08 +02:00
dfighter1985
7b745058a8 CHANGED: #1471 Moved back some more static methods from CLuaIHMRyzom to CLuaIHM, as CLuaIHM can now handle these too. 2012-06-09 22:18:29 +02:00
dfighter1985
3db1f3cc48 CHANGED: #1471 The classes moved in the previous commit are now under the NLGUI namespace. 2012-06-09 03:57:40 +02:00
dfighter1985
529dd877fe CHANGED: #1471 Finally moved some of the basic widget classes and the widget manager, action handler manager to the GUI lib. Also moved some GUI related methods back to CLuaIHM. 2012-06-09 01:37:43 +02:00
kaetemi
2e01e8c4bf Changed: Different default type id for sound sheet id workaround 2012-06-05 19:11:43 +02:00
kaetemi
08e3f3c180 Changed: Reserve sheet id with short id 0 for unknown sheet for new sheet types 2012-06-05 15:13:13 +02:00
kaetemi
72fc210dd0 Changed: Small optimization for sheet id constructor with default type 2012-06-05 14:03:38 +02:00
kaetemi
3fc8a264b5 Fixed: Bad serialization of sound name in background sounds 2012-06-04 13:28:03 +02:00
kaetemi
cb1d9a9f73 Changed: Assign sane type id to temporary sound sheet ids 2012-06-04 13:27:12 +02:00
kaetemi
c54acdb6d2 Changed: Tool build_soundbank can also work without sheet id bin 2012-06-04 12:37:56 +02:00
kaetemi
cb0cbdff89 Changed: Removed some debug messages 2012-06-04 12:35:34 +02:00
kaetemi
6cfb10a275 Fixed: Make build_soundbank tool work with latest changes 2012-06-03 16:00:43 +02:00
kaetemi
fb7689db88 Added: Temporary workaround for using sound sheet id without updated sheet id bin 2012-06-03 15:57:57 +02:00
kaetemi
41069c4582 Changed: Also handle distMax with negative alpha in new manual rolloff function 2012-06-03 15:56:47 +02:00
kaetemi
1eae7bc35b Changed: Avoid some more sqrt calculations 2012-06-03 02:00:32 +02:00
kaetemi
1709e7ed8a Added: Specific code for amplitude based rolloff to avoid unneccesary log10 and pow calls and improve performance 2012-06-03 01:50:53 +02:00
kaetemi
0d05d505f3 Changed: Debug messages 2012-06-02 23:06:48 +02:00
kaetemi
1a32d2691c Fixed: Sound CSheetId implementation 2012-06-02 18:12:38 +02:00
kaetemi
1ac3f3f170 Fixed: Sound CSheetID implementation (part 3) (partially tested) 2012-06-02 16:06:10 +02:00
kaetemi
c935b00119 Fixed: Sound CSheetID implementation (part 2) (not tested) 2012-06-02 15:24:21 +02:00
kaetemi
a2c2d78fe8 Added: Additional constructor for CSheetId with default type, in case the user did not put the type with the sheet name 2012-06-02 15:21:03 +02:00
kaetemi
ea6ede03ba Fixed: Sound CSheetId implementation (part 1) (not tested) 2012-06-02 14:54:39 +02:00
kaetemi
caf00a5b7c Added: Missing implementation of initWithoutSheet to use CSheetId without a sheet_id.bin, required for leveldesign and build tools 2012-06-02 14:53:11 +02:00
kaetemi
b7d687d0c0 Merged: From default to sound_dev 2012-06-02 11:09:14 +02:00
dfighter1985
5ea64cb530 CHANGED: #1471 CViewRenderer no longer depends on CClientConfig, and is now part of NELGUI, under the NLGUI namespace. 2012-06-02 02:09:58 +02:00
dfighter1985
8d2f01fac8 ADDED: #1471 Added new class CWidgetManager, and started to move code into it from CInterfaceManager. 2012-05-30 02:12:37 +02:00
sfb
2f9410f22d Fixed EOL issues and added .hgeol file. 2012-05-29 08:31:11 -05:00
dfighter1985
4053fe6f8d CHANGED: #1471 According to dnk-88 these methods are no longer needed, the XML description file is enough for the plugins. 2012-05-27 23:35:46 +02:00
dfighter1985
c3aff5dc6b ADDED: #1471 OVQT GUI Editor plugin skeleton code. 2012-05-27 21:52:02 +02:00
Fabien_HENON
67a05e8c28 Changed: #1469 StringId conversion to CSheetId for sounds 2012-05-26 23:40:27 +02:00
Fabien_HENON
ae78742ca6 Changed: #1469 Getting last version from default branch 2012-05-26 21:38:30 +02:00
Fabien_HENON
c2a054fe90 Changed: #1469 StringId conversion to SheetId for sounds V2 (DOES NOT COMPILE YET) 2012-05-26 19:21:19 +02:00
dfighter1985
42919dc86b CHANGED: #1471 CInterfaceExpr, CInterfaceExprNode and related classes are now in NELGUI and under NLGUI namespace. 2012-05-25 03:21:03 +02:00
kervala
c97a644050 Fixed: Compilation under Mac OS X without -DWITH_STATIC_DRIVERS=ON 2012-05-24 20:28:19 +02:00
dfighter1985
2fff0616a5 CHANGED: #1471 CInterfaceProperty is not part of the NELGUI library and is under NLGUI namespace. 2012-05-24 18:23:51 +02:00
rti
4d3b601fe4 Fixed: Build on Mac OS X, "id" is a datatype in objective-c(++) 2012-05-24 16:33:56 +02:00
dfighter1985
bb9101ae9f ADDED: #1471 added a global db manager for the GUI library, also added support for resizeing the CDB bank handler. 2012-05-24 00:55:50 +02:00
Fabien_HENON
efc409a319 Changed: #1469 StringId conversion to SheetId for sound (DOES NOT COMPILE YET) 2012-05-23 22:27:39 +02:00
kaetemi
f7ca61f461 Added: Hack to exclude .sound sheets starting with _ from being filtered out from the sheet_id.bin. Sound sheets do not follow the conventional sheets naming pattern at the moment 2012-05-23 22:05:34 +02:00
dfighter1985
c817c68e83 CHANGED: #1471 Moved the stuff I moved to NELGUI library, under the NLGUI namespace. 2012-05-23 19:40:41 +02:00
dfighter1985
731d1ced46 CHANGED: #1471 Moved the previously refactored code to the NELGUI library. 2012-05-23 04:13:58 +02:00
kervala
4c0d138212 Fixed: Some Windows.h inclusions 2012-05-21 10:03:08 +02:00
kervala
bd1b1a3e2b Changed: #878 Fix typos in comments/code 2012-05-19 23:43:42 +02:00
dfighter1985
2af7e250b2 Moved some Lua stuff over to the NelGUI library. 2012-05-19 23:00:52 +02:00
dfighter1985
e1b6690e6f Moved some Lua related string formatting methods from CInterfaceManager to
LuaHelperStuff namespace.
2012-05-19 00:00:09 +02:00
kervala
301f80526d Fixed: Compilation under Linux 2012-05-18 21:08:21 +02:00
kervala
844c22c16b Fixed: #1328 Map time and weather Issue (synced with SVN, thanks!) 2012-05-18 20:53:59 +02:00
dfighter1985
88cc7df755 Refactored the CEvent -> CEventDescriptor code in CInputHandlerManager. Extracted it as a new class CInputHandler, and moved some of it to CInterfaceManager. 2012-05-17 03:28:50 +02:00
sfb
d3d2aa1359 merge incoming 2012-05-15 13:52:33 -05:00
sfb
b808129f89 Changed: #1306 Added basic new form creation. Lots of bugs still. 2012-05-15 13:51:48 -05:00
kervala
c147b63082 Changed: #1275 Compilation under Mac OS X 2012-05-15 12:58:20 +02:00
kervala
9b2b51b6a5 Changed: #825 Remove all warnings when compiling Ryzom 2012-05-15 12:55:56 +02:00
kervala
7db67187ef Changed: #1275 Use of NLDRIVERGL or NLDRIVERGLES namespaces with NL_STATIC to avoid duplicated symbols 2012-05-14 13:21:00 +02:00
kervala
c776284db1 Changed: #825 Remove all warnings when compiling Ryzom 2012-05-14 13:06:37 +02:00
kervala
e9408a8a0f Changed: #1275 Create an OpenGL ES driver 2012-05-13 17:43:46 +02:00
kervala
41e103bc7a Changed: #1275 Added OpenGL ES CMake module 2012-05-13 16:23:48 +02:00
kervala
61d7295efa Changed: #1275 Create an OpenGL ES driver 2012-05-13 15:27:20 +02:00
kervala
a7d6082d49 Changed: Include OpenGL headers in "opengl" directory 2012-05-13 15:26:45 +02:00
kervala
798aec2e4f Changed: Update glext.h 2012-05-12 20:58:23 +02:00
kervala
bfa731e39b Changed: #1275 Create an OpenGL ES driver 2012-05-12 20:56:37 +02:00
kervala
3a40ef6d12 Changed: Include stdopengl.h in Objective-C files 2012-05-12 20:55:58 +02:00
kervala
b8794f814c Fixed: Renable PCH under for OpenGL driver under Mac OS X 2012-05-12 20:54:37 +02:00
kervala
b8dde56d41 Changed: #1275 Create an OpenGL ES driver 2012-05-12 19:21:52 +02:00
dfighter1985
e3d72333dd Moved event descriptors under the NLGUI namespace. 2012-05-10 23:31:39 +02:00
dfighter1985
c976419448 Created NELGUI library, moved the GUI event descriptors there. 2012-05-10 22:17:04 +02:00
sfb
7abfe97f3e Changed: #1306 Implemented basic form saving. 2012-05-03 08:02:14 -05:00
kaetemi
5c8ba72685 Fixed: Compile error 2012-04-30 09:38:27 +02:00
dfighter1985
e6f5bdef0b Merging cdb-refactoring into gui-refactoring. 2012-04-28 21:36:39 +02:00
dfighter1985
ec0eb455e3 Merging default into cdb_refactoring. 2012-04-28 19:55:46 +02:00
dfighter1985
5f041538c8 Added new class CCDBManager, which encapsulates the separate CDB components into a easily (re)usable database solution. Also made CCDBSynchronized and CInterfaceManager use it. 2012-04-27 22:49:38 +02:00
sfb
d8c211db8e merge 2012-04-26 13:07:43 -05:00