aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-20 05:56:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2948 commits 14 branches 0 tags 243 MiB
Commit graph

478 commits

Author SHA1 Message Date
Quitta
c95fd0aefd register refactoring + small bug fixes that went unnoticed before 2013-06-19 06:50:08 +02:00
Botanic
d544921f87 add_user example 2013-06-18 10:48:54 -07:00
Quitta
446569ecb9 show error message + tooltips while registering 2013-06-18 16:27:57 +02:00
Quitta
6e621e1677 Damn its early in the morning :D Oh well! Register works with a callback function. shows which fields are correctly filled in and which not yet. It runs quite smooth. Off to bed now! 2013-06-18 07:22:24 +02:00
Quitta
bcc19a09d4 Changed register form + tried getting messages passed 2013-06-17 21:42:33 +02:00
Quitta
55acd2aab2 Select automatically if it should load with no_visible_elements on or off + minor updates 2013-06-17 16:29:20 +02:00
Botanic
1947120095 fix top menu 2013-06-17 06:57:22 -07:00
Quitta
d7be3a1a78 Trying to intigrate the home template in the inheritance structure of smarty 2013-06-17 15:39:55 +02:00
Botanic
1f590f529d fixed js issue 2013-06-17 03:08:45 -07:00
Quitta
c502acdeb3 Tour seems to work here, not sure though 2013-06-17 11:03:31 +02:00
Botanic
b7052ff21c working on help tips 2013-06-17 00:25:04 -07:00
Botanic
93937db2d9 changed default skin to cerulean and constrained proportions in css 2013-06-16 23:28:58 -07:00
Botanic
6581e2393d changed index.php to correct file and created charisma index for backup 2013-06-16 23:13:38 -07:00
Botanic
473703c19f cleaned up formatting and added custom.css 2013-06-16 22:57:09 -07:00
Botanic
1d155268d2 changed to default will override with custom.css 2013-06-16 22:46:50 -07:00
Botanic
340b5496ab updated the index pages with home register and login 2013-06-16 20:11:11 -07:00
Botanic
1cb9529d46 Merge with quitta-gsoc-2013 2013-06-16 00:59:10 -07:00
Quitta
d78eaf987e Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE' 2013-06-16 01:40:13 +02:00
Botanic
be36372a4c added .tpl.php and removed extra files 2013-06-15 15:20:16 -07:00
Botanic
545b6c12b3 Merge with quitta-gsoc-2013 2013-06-15 15:16:57 -07:00
Quitta
a5f6716f88 Basic template integration with css 2013-06-16 00:13:13 +02:00
Botanic
55ae58511a fixed to proper path 2013-06-15 07:11:03 -07:00
Botanic
6b6313fa52 changed to use .php not html 2013-06-15 07:08:38 -07:00
Botanic
ac753b17a0 added charisma 2013-06-15 07:01:11 -07:00
Botanic
80e8daa0be forgot global 2013-06-13 14:41:58 -07:00
Botanic
e657d24824 auto create folders 2013-06-13 14:33:23 -07:00
Botanic
aad9d74e40 latest changes to work on getting registration working 2013-06-10 04:17:55 -07:00
Botanic
d476f58a94 updated template for registration and setting up add_user functions 2013-06-07 04:05:28 -07:00
Botanic
80e7f92637 added base drupal module and removed old phtml file 2013-06-06 23:07:47 -07:00
Botanic
931d59d420 cleaned up templates and got languages working 2013-06-06 22:59:11 -07:00
Botanic
f02620b4ff added in smarty, still need to finish making it load the correct template properly 2013-06-06 21:43:11 -07:00
Botanic
89ae4f94de updated files that were not merged 2013-06-06 03:38:24 -07:00
Botanic
d6e146e864 fixed thanks kervala 2013-06-06 01:28:12 -07:00
Botanic
409376af8d added in-game template file 2013-06-05 23:39:33 -07:00
Botanic
1b276e849a added base class file for sql as well as updated users to use class 2013-06-05 23:19:40 -07:00
Botanic
b4ec05e9b3 changed to use class 2013-06-05 23:10:00 -07:00
Botanic
bc25fb664d initial work on ams_lib 2013-06-05 23:04:46 -07:00
Botanic
c2119e322d why the hell make the faster values for "debug only" waiting it so 1990's 2013-06-05 19:59:53 -07:00
Botanic
e0bcc7802c fixed warning 2013-06-05 19:43:10 -07:00
Botanic
82af1c860e fixed warning 2013-06-05 19:27:06 -07:00
Botanic
e289da824f no reason to make people change the logs path every time 2013-06-05 19:19:09 -07:00
Botanic
e68ab3ca71 Fixed warnings and logout 2013-06-05 19:14:53 -07:00
Botanic
d9e85cba47 No reason to hardcode the path 2013-06-05 19:14:49 -07:00
Botanic
b22b2a174e bad eol's 2013-06-06 02:47:26 -07:00
dfighter1985
ab7d2c1a53 Use to .toUTF8() instead of .toStdString(). 2013-05-04 21:55:41 +02:00
dfighter1985
29793ee97b Merged default 2013-05-04 21:23:55 +02:00
kervala
2e7540370a Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-13 14:40:41 +01:00
kervala
ba089f8548 Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!) 2013-02-12 22:48:37 +01:00
mattraykowski
1740fc306c merging 2013-02-12 12:53:19 -06:00
sfb
847f455a97 fixes #16 - forces tool to create an empty file in the root tool directory as a basis for initial patch generation 2013-02-12 12:45:46 -06:00
mattraykowski
d285e4c6df merging 2013-02-12 10:28:20 -06:00
mattraykowski
47098b3a63 merge from default 2013-02-12 10:24:22 -06:00
kervala
5794497a79 Changed: French comments translated to English 2013-02-11 22:24:48 +01:00
kervala
8409d5a371 Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
98606fb5b5 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
mattraykowski
50e6c8c278 fixes issue #8 - checks for RYZOM_PATH env var, starts in build folder and turns on status line display in screen. 2013-02-01 13:07:51 -06:00
kervala
2b4119c428 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
970a3220d0 Fixed: Compilation with GCC 2012-12-08 13:12:29 +01:00
kervala
43104cd2e9 Fixed: PCH for Georges editor Qt 2012-12-08 13:12:15 +01:00
kervala
4d6ab65a36 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
05ae6371c1 Changed: Minor changes 2012-10-28 13:47:09 +01:00
kervala
89e78b8ad2 Fixed: MFC tools compilation with STLport 2012-10-28 13:41:50 +01:00
kervala
c4706adc76 fixes #3 allow Qt without STLport to link to NeL with STLport 2012-10-28 13:34:58 +01:00
kervala
8e110a8bb8 Fixed: Compilation with 64 bits MFC 2012-10-28 12:22:30 +01:00
kervala
b9fd49ebc3 Move all PACS headers in nel/include/pacs directory (fixes #2) 2012-10-28 11:55:21 +01:00
mattraykowski
01cd3859ca merged default, resvolved conflicts. 2012-10-17 10:00:28 -05:00
mattraykowski
1c8841eb57 merged from default 2012-10-17 08:52:01 -05:00
sfb
7387d6c47d merging gsoc2012-achievements 2012-10-16 12:05:23 -05:00
kervala
0698f1abc2 Changed: Replaced string empty comparisons with empty() 2012-10-06 18:17:57 +02:00
kervala
34d1e33c1c Changed: Use *_PREFIX instead of fixed values with INSTALL 2012-09-27 22:17:47 +02:00
kervala
182a79f2cb Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 13:20:25 +02:00
kervala
3429d7ba42 Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 12:33:02 +02:00
sfb
53077ccd40 Removed: #1378 Removed the reference implementation, the full implementation is available at code/web/app and code/web/api. 2012-09-24 08:18:46 -05:00
kervala
898c87ebe1 Fixed: Compilation with GCC 2012-09-23 20:26:26 +02:00
kervala
29396158d8 Changed: #1493 Fixed some directories 2012-09-22 23:42:40 +02:00
kervala
38c5e6840d Fixed: #1493 MultiArch support 2012-09-22 22:57:38 +02:00
kaetemi
f1be1d9801 Added: CMake projects for ryzom MFC tools (georges edit and world editor plugins) 2012-07-27 12:36:36 +02:00
kaetemi
f4f7965550 Fixed: Compile error in mfc world editor primitive plugin 2012-07-25 10:13:58 +02:00
sfb
2f9410f22d Fixed EOL issues and added .hgeol file. 2012-05-29 08:31:11 -05:00
kervala
edd1012f22 Fixed: Compilation under Windows 2012-05-19 23:47:43 +02:00
vl
c322ff5129 Merge 2012-05-04 12:08:04 +02:00
kervala
bac5b8d084 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 23:47:55 +02:00
kervala
ed95d4ed79 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-07 22:30:39 +02:00
Botanic
1d34a0a467 fixed thanks kervala 2013-06-06 01:28:12 -07:00
Botanic
fe343431a2 No reason to hardcode the path 2013-06-05 19:14:49 -07:00
Botanic
eea5ceaa11 Fixed warnings and logout 2013-06-05 19:14:53 -07:00
Botanic
ba0561766f no reason to make people change the logs path every time 2013-06-05 19:19:09 -07:00
Botanic
69a12addb2 fixed warning 2013-06-05 19:27:06 -07:00
Botanic
f2b47b2efe fixed warning 2013-06-05 19:43:10 -07:00
Botanic
6ccf7df354 why the hell make the faster values for "debug only" waiting it so 1990's 2013-06-05 19:59:53 -07:00
Botanic
8eb1a7c88f bad eol 2013-06-06 02:56:48 -07:00
sfb
548740bafc Fixed: #1378 Imported nimetu's WebIG reference implementation. 2012-03-22 15:48:13 -05:00
sfb
ae10726b98 Fixed: #1414 Copied index.ctp to listdir.ctp and admin_index.ctp to eliminate symlinks. 2012-03-22 15:18:17 -05:00
sfb
f035e13e02 Changed: #1414 Removing symlinks. 2012-03-22 15:17:12 -05:00
sfb
6091c0092e merge from default 2012-03-22 14:31:07 -05:00
dfighter1985
e020106e82 Translation files are now embedded into the binary, also made the source groups a bit more sane. 2012-03-16 17:35:37 +01:00
dfighter1985
a2ad31ae87 The Qt Ryzom client configuration tool can now be built with CMake! 2012-03-16 04:34:16 +01:00
dfighter1985
44c785e7ec Adding the Qt client config tool files from the other repo. 2012-03-16 00:50:04 +01:00
kervala
41551e3026 Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc... 2012-03-03 10:49:42 +01:00
kaetemi
08551ceb4f Fixed: Use $_POST and $_GET instead of deprecated $HTTP_GET_VARS and $HTTP_POST_VARS in the admin tool. 2012-02-29 13:10:59 +01:00
kervala
3bf819651e Fixed: #1420 Client patcher compilation under Mac OS X 2012-01-10 10:19:52 +01:00
kervala
9f0e1482dd Fixed: ryzom_client_patcher missing file 2012-01-07 19:14:24 +01:00
sfb
b7ffe49754 Fixed: #1385 patch_gen uses tmpnam function instead of 'nul' for files with no pre-existing version. Note - used tmpnam instead of mkstemp due to cross-platform compatibility. 2011-12-12 14:38:41 -06:00
kervala
a36017a365 Fixed: #1380 pdr_util, -o command line option (patch provided by nimetu) 2011-10-21 11:34:58 +02:00
kaetemi
143556b098 Changed: #1093 Build pacs prim list to correct location. 2011-09-28 09:49:16 +02:00
kaetemi
7f229a1c0f Changed: #1093 Move the visual_slot.tab to the right place after running sheets packer. 2011-09-26 22:10:48 +02:00
kaetemi
f6c6e6b59a Changed: #28 Clean comments 2011-09-23 00:20:20 +02:00
kaetemi
5189e9eb6f Changed: #1093 Added generic helmets directory to export shape sources. 2011-09-21 23:17:39 +02:00
kaetemi
0d77ba0135 Added: #1093 Missing panoply_generique.cfg file. 2011-09-17 15:58:17 +02:00
kaetemi
29dff59e7c Changed: #1093 Also try ryzom_client_r.exe instead of client_ryzom_r.exe for copying exedll bnp... 2011-09-16 13:57:13 +02:00
Fabien_HENON
95a5316a33 #1304: Guild Missions: Merge with default 2011-08-21 19:29:28 +02:00
kerozcak
29ec7931f3 Changed: #1315 2011-08-21 02:54:22 +02:00
kervala
2d1cc56da3 Removed: Backup files 2011-08-13 17:39:55 +02:00
Fabien_HENON
2afce02712 Changed: #1304: Debug for the guild missions. Now it works ! 2011-08-04 17:04:49 +02:00
Fabien_HENON
6f34bec144 Changed: #1304: Checks in the mission compiler if the do_mission objective is correct (for a guild mission) when we add a number (the number of members from the guild needed to complete the mission) after a mission name 2011-07-23 18:14:31 +02:00
Fabien_HENON
c56fb0762d Changed: #1304: Revert modifications for the objectives in the mission compiler (i changed the way i will do it) 2011-07-23 15:56:32 +02:00
kerozcak
15c74a1f95 Changed: #1315 Added files forgotten to track. 2011-07-20 12:21:20 +02:00
Fabien_HENON
67bc278aea Changed: #1304: Debug of the options added in the script (';' replaced by ':' for parameters separation) 2011-07-19 18:10:28 +02:00
kerozcak
a7d008495a Changed: #1315 Update. 2011-07-14 16:49:25 +02:00
kerozcak
0cd318bcb8 Changed: #1315 Adding work i have done so far. 2011-06-09 18:23:29 +02:00
kerozcak
7f77a27119 Changed: #1315 Adding CakePHP app structure. 2011-06-09 17:53:42 +02:00
kerozcak
e0e710641e merge from default 2011-06-09 17:52:42 +02:00
kerozcak
7aa0429922 Changed: #1315 Directory name changed. 2011-06-09 17:51:49 +02:00
kervala
f06916b4fa Changed: #878 Fix typos in comments/code 2011-06-08 10:14:14 +02:00
kervala
ec90234947 Changed: #825 Remove all warnings when compiling Ryzom 2011-06-05 18:06:00 +02:00
kervala
73b6bee421 Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-05 17:52:40 +02:00
kervala
9652969097 Changed: #878 Fix typos in comments/code 2011-06-04 13:48:27 +02:00
kervala
5b5a050616 Changed: Exceptions catched by reference 2011-06-03 10:35:25 +02:00
kervala
540bc1f62f Changed: Exceptions catched by reference 2011-06-02 18:31:40 +02:00
Fabien_HENON
9128f754fc Changed: #1304: mission_compiler actions: add new ones, check and script generation 
Add 2 new actions for the mission compiler: recv_charge_point and
give_control.
Add the 'guild' option for some actions: check if the mission is
valid, and change the script generation to add this option.
 2011-05-31 22:00:27 +02:00
Fabien_HENON
15e3cb3dd6 Changed: #1304: mission_compiler objectives: check and script generation 
mission compiler now checks if we are not asking several guild
members to complete an objective whereas the mission is not a
guild mission.
It also generates the 'nb_guild_members_needed' parameter for
objectives in the script.
 2011-05-31 16:22:57 +02:00
kervala
cce05665dd Changed: #878 Added new actions comments for translation_tools 2011-05-30 13:31:18 +02:00
sfb
4dd8f89943 merge 2011-05-29 14:09:15 -05:00
sfb
50d15e4c86 Changed: Applied patch fixing the mission_compiler_lib build under Linux 2011-05-29 14:08:46 -05:00
kervala
fbec2565e9 Changed: Compilation with VC++ 2010 without STLport 2011-05-28 15:52:48 +02:00
kervala
39c30152b9 Added: CMake project for mission_compiler_fe 2011-05-26 18:21:06 +02:00
kervala
bc3a3f6f7c Added: CMake project for mission_compiler_lib 2011-05-26 18:08:04 +02:00
dnk-88
5cfaa92c70 Changed: Added preview particle system in geqt. 2011-05-08 01:11:10 +03:00
dnk-88
dc07038a82 Fixed: geqt correctly handles in the FileOpenDialog of cancel action and empty icon 2011-05-07 18:23:23 +03:00
dnk-88
1af3224bc9 Header cascading section resizes is enabled. 2011-05-07 15:51:15 +03:00
Piotr Kaczmarek
d6fde74b27 add web-based translation tool directory 2011-04-29 21:40:17 +02:00
kervala
4aa2c68151 Changed: #878 Fix typos in comments/code 2011-05-31 22:16:17 +02:00
rti
494628f330 Fixed: Compilation with GCC 4.6 2011-04-12 17:15:35 +02:00
rti
7e542e0201 Fixed: GEQT build on gcc 2011-03-10 00:54:37 +01:00
aquiles
bccf9e45cb Changed: #1150 Added splash screen & new dialog + minor changes 2011-03-04 20:52:53 +01:00
aquiles
7d76796ee6 Changed: #1150 Moved private headers 2011-02-18 21:27:31 +01:00
kervala
0b8820ca0c Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +01:00
kervala
96561a980c Fixed: Compilation under Linux 2011-01-14 17:00:39 +01:00
kervala
70c83d483f Fixed: Compilation under Linux 2011-01-14 16:23:22 +01:00
kervala
356816cba7 Changed: #1231 Remove VC++ projects and solutions which are not needed by Nevrax Linux makefiles 2011-01-10 13:50:07 +01:00
kervala
10e8d60c8a Added: mp_generator and named_items_2_csv CMake projects 2011-01-09 15:51:12 +01:00
sfb
1b1e9e2f6b Changed: Remove "rc2" file from World Editor compilation - not used. 2010-12-21 11:32:56 -06:00
aquiles
27af1924fb Merge 2010-12-19 16:52:13 +01:00
aquiles
69122decec Changed: #1206 icon location; reinit timer on visible 2010-12-19 16:50:38 +01:00
rti
e316e95579 Fixed: missing include 2010-12-14 18:12:15 +01:00
aquiles
4c3a646465 Changed: #1206 icon location; reinit timer on visible 2010-12-12 23:28:03 +01:00
rti
99e60e2047 Fixed: #1216 plugin and resource paths 2010-12-12 22:12:45 +01:00
rti
1505a457c8 Added: Georges Editor Qt Logo 2010-12-12 19:18:52 +01:00
rti
39aa4ad2df Fixed: #1190 Run Georges Editor Qt on Mac OS X 2010-12-12 19:10:58 +01:00
aquiles
127dc6ffd5 Changed: #1206 fixed missing stuff 2010-12-12 15:57:34 +01:00
kervala
8bc4a7fcdf Fixed: Compilation under Linux 2010-12-12 15:15:10 +01:00
kervala
d4ef878899 Changed: #878 Fix typos in comments/code 2010-12-12 15:12:49 +01:00
aquiles
9a3a42671c Changed: #1150 Switched to 3d view plugin 2010-11-29 15:43:46 +01:00
Matt Raykowski"
8b4d5ee5d3 Changed: Forgot to make World Editor an MFC-only tool. 2010-11-22 20:31:25 -06:00
aquiles
afca6154f9 Changed: #1150 reactivated 3d view and improved behaviour 2010-11-22 21:21:07 +01:00
aquiles
64fa95c029 Fixed: #1163 files for new dialog 2010-11-21 18:59:29 +01:00
aquiles
7bb2f4edd4 Fixed: #1163 icons show up small in table and full size in tooltip over icon cell - dblClk on cell opens filedialog for changing icon 2010-11-21 17:43:38 +01:00
aquiles
24bb6ada51 Changed: #1150 added progress dialog to show CPath progress and changed config behaviour 2010-11-21 17:40:58 +01:00
kervala
37d85c1922 Changed: #825 Remove all warnings when compiling Ryzom 2010-11-21 15:07:59 +01:00
sfb
cad19bba81 merge 2010-11-18 09:13:19 -06:00
sfb
79324812b4 Changed: Fixed paths that reference a moved NLLIGO header. 2010-11-18 09:09:03 -06:00
sfb
aff679338e Changed: #842 Started adding World Editor to CMake build. 2010-11-18 09:08:24 -06:00
aquiles
1aaa7df862 Changed: #1150 fixed some dockwidgets bugs 2010-11-15 00:04:10 +01:00
aquiles
790bf9514c Changed: #1150 added some source groups to cmake for better file structuring 2010-11-14 22:01:19 +01:00
aquiles
bff02807ee Fixed: #1168 default & parent box working like a breeze 2010-11-14 21:49:19 +01:00
rti
e80b6df4a2 merge 2010-11-14 16:02:00 +01:00
rti
8c61ab8fb0 Changed: #1190 build app bundle and use QWidget instead of QGLWidget 2010-11-14 15:59:32 +01:00
kervala
0f7b988352 Changed: #878 Fix typos in comments/code 2010-11-13 18:33:01 +01:00
kervala
6362857850 Changed: #878 Fix typos in comments/code 2010-11-12 14:26:38 +01:00
aquiles
cb41dab265 Changed: #1150 some layout stuff - widgets should behave better now 2010-11-08 14:19:01 +01:00
aquiles
4fa112a08c Changed: #1168 default checkbox activated, formdelegate adapted to introduced proxymodel 2010-11-08 14:14:28 +01:00
kervala
e6f7f65caf Changed: #825 Remove all warning when compiling Ryzom 2010-11-03 20:47:01 +01:00
kervala
cbce7633d6 Changed: #825 Remove all warning when compiling Ryzom 2010-11-03 13:45:08 +01:00
kervala
708d0503a3 Changed: #878 Fix typos in comments/code 2010-11-03 13:44:27 +01:00
kervala
bc1fed6c60 Fixed: Georges Editor Qt compilation under Linux 2010-11-02 20:51:39 +01:00
aquiles
9e7ef3a859 Changed: #1150 Code Cleanup 2010-11-02 15:25:36 +01:00
aquiles
0f488de2de Added: Georges Editor Qt first revision 2010-11-02 13:47:24 +01:00
kervala
08386e0c28 Changed: #825 Remove all warning when compiling Ryzom 2010-10-30 14:20:26 +02:00
kervala
ff1de97c98 Changed: #1051 Check for client.cfg in Ryzom application directory 2010-10-19 21:12:34 +02:00
kervala
f7f6ace84f Changed: #1051 Crash when index is out of bounds 2010-10-19 21:11:42 +02:00
kervala
fec5b3f596 Changed: Build world_editor only under Windows 2010-10-18 23:12:07 +02:00
Matt Raykowski"
e9ebb9ae1f Fixed: Nightly Linux build failed - 'export' tool is Windows only. 2010-10-18 10:30:55 -05:00
kervala
7db03223fc Changed: #142 Replace atoi and sscanf by fromString when it's possible 2010-10-18 13:00:39 +02:00
kervala
00c431845a Changed: #825 Remove all warning when compiling Ryzom 2010-10-18 09:05:11 +02:00
kervala
b7e53676da Fixed: client_patcher compilation 2010-10-18 09:03:17 +02:00
kervala
15cb5a955b Changed: #1023 Use a standard application path for writing files 2010-10-16 20:07:20 +02:00
kervala
cd78367f50 Changed: Replaced DeleteFile (Win32) by NLMISC::CFile::deleteFile 2010-10-16 19:59:53 +02:00
kervala
6ec0afb12a Changed: Replaced DeleteFile (Win32) by NLMISC::CFile::deleteFile 2010-10-16 19:05:06 +02:00
kervala
7cbb7da54e Changed: #825 Remove all warning when compiling Ryzom 2010-10-16 18:58:53 +02:00
sfb
3f3611b92e Merge 2010-10-15 20:54:14 -05:00