kaetemi
0bcbb3f4aa
Adjust 3ds Max plugin versioning info
2014-07-28 18:31:20 +02:00
kaetemi
2c6b53c53e
Fix NeL Tools compile under MinGW
2014-06-18 21:05:39 +02:00
kaetemi
30072a64c9
Set exec mode
2014-05-23 22:39:50 +02:00
kaetemi
b932a7de2a
Add --admininstall parameter to c1_shard_patch
2014-05-23 17:25:52 +02:00
kaetemi
1bd6e0993a
Fix Windows compilation of lightmap_optimizer
2014-05-23 01:57:19 +02:00
liria
b4b1e639fd
Merged default into lightmap_optimizer_port_to_linux
2014-05-15 16:36:59 +02:00
dfighter1985
f32545dda8
Moved ovqt to /code/studio
2014-05-06 01:30:28 +02:00
kaetemi
989965e33f
Fix EOL
2014-04-30 12:53:06 +02:00
dfighter1985
c83ccc76bb
Tile Editor crash fixes.
2014-04-23 02:10:14 +02:00
dfighter1985
324aa7f851
Build fixes.
2014-04-23 00:49:17 +02:00
dfighter1985
e24447e98c
Merged Georges Editor branch.
2014-04-22 21:12:26 +02:00
dfighter1985
392061f06b
Merged default.
2014-04-22 21:10:19 +02:00
dfighter1985
04b2b69909
Merged default.
2014-04-22 21:02:34 +02:00
dfighter1985
8c23925246
Merge default.
2014-04-19 21:53:29 +02:00
liria
89097aa4a1
Typo correction
2014-04-05 13:49:14 +00:00
liria
610226d100
Merged default into lightmap_optimizer_port_to_linux
2014-04-05 15:40:17 +02:00
kaetemi
7e6cf7c213
Fix crash in 0_setup.py on Linux
2014-03-15 09:12:40 +01:00
kaetemi
979502cbdd
Separate output directories from input directories
2014-03-12 19:19:52 +01:00
Jan Boon
f2536515ec
Merged in StudioEtrange/ryzomcore/ovqt-fixes (pull request #54 )
...
OVQT Plugins - CMake Install fixes
2014-02-21 04:53:06 +01:00
kaetemi
e8c482d36c
Disable build of dataset packed sheets in build pipeline
2014-02-20 20:15:18 +01:00
kaetemi
14a6776d0b
Update default directories
2014-02-20 03:37:23 +01:00
kaetemi
4433139a8e
Add script for creating a new shard patch
2014-02-20 03:09:31 +01:00
kaetemi
0934e84757
Rename scripts
2014-02-20 01:31:09 +01:00
kaetemi
3c5d35137d
Nicer batch scripts for pipeline
2014-02-20 01:06:29 +01:00
kaetemi
78f6aa1ce9
Add build process script for shard sheets
2014-02-19 23:51:55 +01:00
StudioEtrange
3da6355d73
CMAKE TARGET : SHARED and MODULE
...
About Shared Library (shared) and Module Library (module) type of cmake target
INSTALL command has different behaviour for ARCHIVE LIBRARY RUNTIME depending on the platform
2014-02-16 19:43:44 +01:00
kaetemi
c6e291c470
Only copy if needed
2014-02-14 02:46:07 +01:00
kaetemi
f4a4a41fbf
Fix default directory
2014-02-14 02:03:22 +01:00
kaetemi
93a6e13d5e
Extend shard data script to gather executables and configurations
2014-02-14 01:21:05 +01:00
kaetemi
3860006530
Add directories for patchman to gamedata setup
2014-02-14 01:01:02 +01:00
kaetemi
46ab8acea7
Extend shard data script
2014-02-13 22:02:25 +01:00
kaetemi
0b3186ac6a
Clean translation diffs from OLDVALUE comments before merge, issue #116 , patch provided by Łukasz K
2014-02-12 16:35:07 +01:00
kaetemi
46bf57aaf7
Fix make_merge_wk for uxt
2014-02-10 16:38:04 +01:00
kaetemi
0366f021ea
Cleanup
2014-02-09 22:35:01 +01:00
kaetemi
c9437f9bd5
Cleanup
2014-02-09 22:21:30 +01:00
kaetemi
ad40eb6450
Fix the bug that caused the shape exporter to crash
2014-02-09 22:12:44 +01:00
kaetemi
aaad67a5e5
Cleanup
2014-02-09 21:53:49 +01:00
kaetemi
c0e55b4cc6
Fix export of NeL Flare
2014-02-09 17:26:26 +01:00
kaetemi
b4c2c28ee6
Remove pacs.packed_prims when done
2014-02-09 02:42:45 +01:00
kaetemi
bce5b31a6a
Move visual slot tab to separate directory
2014-02-09 02:40:14 +01:00
kaetemi
28235008ea
Fix typo
2014-02-08 23:57:39 +01:00
kaetemi
f97dfa1d09
Implement skip for rbank process
2014-02-08 23:43:42 +01:00
kaetemi
3fadcb1f53
Implement skip for ig elevation
2014-02-08 22:54:25 +01:00
kaetemi
8dc1a89440
Implement skip for zone dependency process
2014-02-08 22:23:24 +01:00
kaetemi
a5282ccb7e
Get properties search paths from python variable
2014-02-08 22:07:33 +01:00
kaetemi
045e0c3ec6
Fix lightmap optimize skip
2014-02-08 21:09:35 +01:00
kaetemi
23cf77ea2f
Implement skip for coarse mesh build process
2014-02-08 21:02:24 +01:00
kaetemi
c04eea9a22
Implement skip for shape lightmap optimize build process
2014-02-08 20:02:57 +01:00
kaetemi
76009d8b05
Implement skip for interface build process
2014-02-08 19:44:52 +01:00
kaetemi
4a71690859
Add script to automatically merge translation wk files
2014-02-08 17:36:17 +01:00
kaetemi
b7fe5153d3
Add script to make and merge all translation diffs
2014-02-08 17:10:34 +01:00
kaetemi
3481ad75e8
Add short translation procedure readme
2014-02-08 17:01:13 +01:00
kaetemi
7c901bf5d8
Improve leveldesign_dev.bat
2014-02-08 16:24:56 +01:00
kaetemi
6976f9e4fa
Adjust default paths
2014-02-08 01:34:16 +01:00
kaetemi
134ddf193a
Add clause translation tool scripts
2014-02-08 01:03:01 +01:00
kaetemi
db53075a4f
Add translation tool scripts
2014-02-08 00:23:42 +01:00
kaetemi
4009f03f4c
Add translation directory to pipeline setup
2014-02-08 00:03:56 +01:00
kaetemi
7fb942cbbf
Copy refs in client install
2014-02-07 19:35:55 +01:00
kaetemi
01850f9b96
Add refs to patch xml
2014-02-07 18:30:55 +01:00
kaetemi
f9c9fbd0be
Reorder pipeline scripts
2014-02-07 18:10:09 +01:00
kaetemi
b5d354a92b
Add world edit data install directory to pipeline setup
2014-02-07 18:04:23 +01:00
kaetemi
fe36caf6fc
Typo
2014-02-07 17:23:34 +01:00
kaetemi
343f7e8c39
Add build shadow skin to shape process
2014-02-07 17:16:40 +01:00
kaetemi
f223a551ad
Generate correct client.cfg data path for dev client
2014-02-07 15:26:15 +01:00
kaetemi
719a316acd
Replace shard install script
2014-02-07 14:53:47 +01:00
kaetemi
332b17c382
Remove duplicate tool
2014-02-07 02:17:42 +01:00
kaetemi
7ed267dd7d
Backed out changeset: de1de16eef3b
2014-02-07 01:49:39 +01:00
kaetemi
68f1440967
Include world editor files directory in prim export
2014-02-07 01:49:16 +01:00
kaetemi
c82c82c44d
Improve debug message
2014-02-07 01:49:01 +01:00
kaetemi
0d317d64c6
Let prim checker only open files with ig extension
2014-02-07 01:01:36 +01:00
kaetemi
9ef5fcaacd
Add primitives directory to rbank lookup (needed file_index.cfg - is this the correct primitives dir?)
2014-02-07 01:01:19 +01:00
kaetemi
29a70767b4
Merge with default
2014-02-07 00:11:12 +01:00
kaetemi
8647d960b6
Include world editor files in rbank process, part of what caused water not to build
2014-02-06 23:58:18 +01:00
kaetemi
964e1a4bb7
Add more paths to the build gamedata configuration
2014-02-06 23:49:54 +01:00
kaetemi
fc0406eb77
Build pacs prim list txt outside repository
2014-02-06 22:10:56 +01:00
kaetemi
5540ec9375
Add separate target directory for shard data
2014-02-06 21:44:14 +01:00
kaetemi
f37ed8c753
Update default paths
2014-02-06 20:31:43 +01:00
kaetemi
652f6b5247
Merge with default
2014-02-06 20:16:18 +01:00
kaetemi
80477df91e
Merge with default
2014-02-06 19:54:15 +01:00
kaetemi
f3a1dad1d2
Remove georges4cvs feature
2014-02-03 01:25:02 +01:00
kaetemi
ce88e5836a
Remove georges4cvs feature
2014-02-03 00:16:35 +01:00
liria
b1fb181b56
use NEL CFile function for file test
2014-01-25 17:09:07 +01:00
liria
0e48ab1a38
make the programm compile on linux plateform
2014-01-25 11:50:14 +01:00
kervala
7ee9607f41
Changed: Enable ig_elevation everywhere (patch by Liria)
2014-01-23 13:08:11 +01:00
liria
9d39e8b0a0
Merged default into ig_elevaton_port_to_linux
2014-01-23 00:49:56 +01:00
liria
39948bd5c7
CMakeLists.txt edited online with Bitbucket - remove merge conflict with default branche
2014-01-22 23:49:11 +00:00
kaetemi
6d39fd64b3
Fix Qt build on Windows
2014-01-21 12:50:23 +01:00
botanic
b358155f73
dont force null driver, doesnt work on all cards and disable maximising max while running pipeline
2013-12-30 10:03:49 -08:00
botanic
ef83530ccc
un kaetemi'd the pipeline
2013-12-30 08:59:59 -08:00
botanic
7a8dd2829f
added single bat file to run whole pipeline
2013-12-29 23:25:09 -08:00
kervala
eb7299b8eb
Changed: #85 Compilation with STLport + EOL
2013-11-22 11:25:53 +01:00
kervala
fae156d22d
Fixed : #85 Compilation with STLport
2013-11-22 11:25:12 +01:00
kervala
559e5ed395
Fixed: Assign instead of comparison
2013-11-22 11:20:07 +01:00
kervala
57a4c0ece1
Changed: EOL
2013-11-13 21:45:06 +01:00
kervala
753c5d6378
Changed: Replaced atof by fromString
2013-11-13 21:37:28 +01:00
sfb
35cf55adca
Bad logging, content is unsigned const char*, fixed it to use %s and not cast.
2013-10-28 12:58:08 -05:00
sfb
2220c593f5
Bad merge resolution, fixed a couple source files which merged poorly.
2013-10-28 11:24:31 -05:00
sfb
436970dc46
Bad merge resolution, fixed the build files that merged poorly.
2013-10-28 11:24:02 -05:00
sfb
e9b8e2edba
merge from default
2013-10-23 12:08:09 -05:00
kervala
2becb762f8
Fixed: Some warnings
2013-09-29 16:26:24 +02:00
kervala
be6a77e9de
Fixed: Compilation under Linux
2013-09-28 10:18:35 +02:00
kervala
6b9e9b8486
Changed: Include Lua headers directory for GUI Editor
2013-09-27 16:43:02 +02:00
kaetemi
3d53e078a5
Fix line endings
2013-09-27 00:08:49 +02:00
kervala
b5c625f261
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-24 21:33:59 +02:00
kervala
df8c6e9b08
Changed: Created NELID macro to fix warning "multi-character character constant"
2013-09-22 13:10:57 +02:00
kervala
7f6959ce39
Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)
2013-09-08 12:57:34 +02:00
kervala
712f9ad2a0
Fixed: Integer 32 bits conversion to 64 bits pointer
2013-09-06 14:51:21 +02:00
kervala
a2f91ce484
Changed: Tabulations to spaces
2013-08-05 10:30:40 +02:00
kaetemi
a519de3e5d
Build ligo outside the database
2013-07-27 04:03:05 +02:00
kaetemi
9587ccc6ba
Silently sneaking in a nicer splash image for ovqt
2013-07-25 02:39:07 +02:00
kaetemi
da53f11c73
Use tags for pacs prim export
2013-07-24 20:51:38 +02:00
kaetemi
b6c869f072
Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs
2013-07-19 15:37:25 +02:00
liria
053abe4b07
kervala's enhancements and fixes for the Windows compilation.
2013-06-09 15:55:59 +02:00
liria
c5f77a12df
FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows.
2013-06-08 16:15:41 +02:00
liria
78f9800b17
FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows with using conditional compilation.
2013-06-08 15:38:04 +02:00
liria
4caa7fba89
FIXE: replace the WIN32 API for directories manipulation by the the POSIX API to compile with linux.
2013-06-08 14:39:30 +02:00
dfighter1985
07045b7880
Making GCC happy.
2013-05-15 01:54:35 +02:00
dfighter1985
8888122737
Inconsistent line ending style, according to VS. How it managed to do this is a mystery tho.
2013-05-10 22:35:04 +02:00
dfighter1985
9382e6d1f9
Added some defaults.
2013-05-10 22:29:47 +02:00
dfighter1985
2dbf68d6e4
Make sure to apply the changes, when changing properties.
2013-05-10 00:55:23 +02:00
dfighter1985
c030ad755d
When adding a new widget, the correct widget is now instantiated. Also added some checks.
2013-05-09 23:57:48 +02:00
dfighter1985
101d2cc612
Some more work for widget adding support. Basically the system works, just need to make sure the proper widget is instantiated, and the defaults are loaded ( so it shows up ).
2013-05-09 05:53:14 +02:00
dfighter1985
00fa4cb321
Added some more checks, signal and slots related to widget adding.
2013-05-05 05:49:35 +02:00
dfighter1985
dad844cc99
Added GUI for widget adding.
2013-05-05 04:58:15 +02:00
dfighter1985
059147a5b3
Merged default.
2013-05-04 22:28:31 +02:00
dfighter1985
e9d646d864
Merged default
2013-05-03 02:07:38 +02:00
sfb
70397fe3bd
merge
2013-05-02 14:34:40 -05:00
sfb
76dea51b8f
fixed #40 with an explicit static_cast.
2013-05-02 14:31:10 -05:00
dfighter1985
8dd4c1abfe
Don't build GUI Editor when not building the GUI library.
2013-05-02 20:19:35 +02:00
dfighter1985
8c2db11be3
FIXED: Widgets will no longer get stuck in the widget hierarchy tree, when deleting their parent.
2013-03-09 22:02:31 +01:00
dfighter1985
b106d18c8b
MODIFIED: Widgets derived from CInterfaceGroup should now be deleted too properly.
2013-03-08 06:07:21 +01:00
dfighter1985
8af3618cbf
MODIFIED: collapse the widget hierarchy tree and remove the widget from it when it's deleted. Also clear the widget properties panel.
2013-03-03 03:49:56 +01:00
dfighter1985
b731004c61
MODIFIED: GUI Editor can now delete widgets.
2013-03-02 06:57:40 +01:00
dfighter1985
10adcb5549
MODIFIED: When selecting a widget in the central widget, the hierarchy tree should now be updated as well.
2013-03-02 03:24:22 +01:00
dfighter1985
84a4ac2f0d
MODIFIED: Update property browser when selecting in the central widget.
2013-02-23 06:55:19 +01:00
dfighter1985
f55ab4e21e
GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS().
2013-02-20 22:05:09 +01:00
dfighter1985
668e34f996
MODIFIED: #20 Resolved build errors with stlport.
2013-02-19 19:29:48 +01:00
dfighter1985
8a486224d7
MODIFIED: #20 Resolved some GCC build in the GUI Editor.
2013-02-19 17:16:58 +01:00
mattraykowski
aa261f28a4
merging gui editor repo.
2013-02-14 09:53:06 -06:00
dfighter1985
543488b490
Merged mainline default branch changes.
2013-02-14 10:47:10 +01:00
kervala
4f6cb3e329
Changed: Typo fixes (Thanks to DuDraig!)
2013-02-12 17:35:51 +01:00
kervala
b368cae7a5
Changed: Typo fixes (Thanks to DuDraig!)
2013-02-12 17:07:38 +01:00
kervala
1bf4109e5b
Changed: Typo fixes (Thanks to DuDraig!)
2013-02-11 22:34:24 +01: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
39668984c1
Changed: Typo fixes (thanks to Vagrant!)
2013-02-08 13:26:07 +01:00
kervala
98606fb5b5
Changed: Typo fixes (thanks to Vagrant!)
2013-02-08 13:17:44 +01:00
mattraykowski
0743a9323c
merge from default
2013-01-30 10:15:14 -06:00
mattraykowski
75f40c9e79
merge, fixed inconsistent newlines
2013-01-30 09:57:53 -06:00
dnk-88
da8e532e8e
Change: Optimized placement source files in object viewer qt
2013-01-06 16:25:28 +03:00
dnk-88
697a92b1d6
Change: Fixed incorrect behavior scroll of 2d view in landscape editor qt
2012-12-15 00:41:29 +03:00
kervala
2b4119c428
Fixed: Compilation with VC++ 2010 and 2012
2012-12-11 12:22:41 +01:00
kervala
cbb8631789
Fixed: PCH for Object Viewer plugin
2012-12-08 13:11:17 +01:00
kervala
f6e1bc3f3a
Changed: Methods constification
2012-12-08 11:27:18 +01:00
kervala
275d7cf181
Changed: Add Qt headers in PCH for speed improvement
2012-12-08 11:25:21 +01:00
kervala
4d6ab65a36
Changed: Code simplification
2012-12-08 11:24:43 +01:00
kervala
cb6aefd69d
Added: PCH for Georges Editor Plugin
2012-12-08 11:22:05 +01:00
kervala
91b63a4f3b
Changed: Compilation with GCC
2012-12-08 11:18:26 +01:00
dfighter1985
5f0e715df4
MODIFIED: #1471 Forgot to remove parents' properties before saving the node properties.
2012-12-02 19:47:12 +01:00
dfighter1985
713c256c2a
MODIFIED: #1471 We should be able to close the application even when there's no loaded project.
2012-12-02 18:17:39 +01:00
kervala
e344fe26cb
Changed: Applied Kaetemi patch to disable old S3TC library mistakes
2012-12-02 10:20:19 +01:00
dfighter1985
421582d386
MODIFIED: #1471 Merged mainline default to this branch.
2012-11-25 05:22:40 +01:00
kervala
e986569ef9
Fixed: Wrong EOL
2012-11-24 18:38:56 +01:00
dfighter1985
bbaefe88d5
MODIFIED: #1471 Exiting OVQT will now work again properly.
2012-11-22 21:22:28 +01:00
dfighter1985
0ce956b71a
MODIFIED: #1471 There shouldn't be an error message when clicking cancel in the open file dialog.
2012-11-21 23:36:07 +01:00
dfighter1985
1667365842
MODIFIED: #1471 Widget template changes can now be saved.
2012-11-21 21:33:08 +01:00
dfighter1985
6343ce5750
MODIFIED: #1471 Oups, forgot these warning messages...
2012-11-20 04:54:09 +01:00
dfighter1985
e8d3255990
MODIFIED: #1471 Adding new widget now works in the widget property dialog.
2012-11-20 04:50:51 +01:00
dfighter1985
2f18aec5d4
MODIFIED: #1471 Adding new property now works.
2012-11-19 21:06:26 +01:00
dfighter1985
c7131429c9
CHANGED: #1471 Removing widget properties from the widget properties dialog will now work.
2012-11-18 02:20:52 +01:00
dfighter1985
b223bb43ad
CHANGED: #1471 Removing widgets from the widget properties dialog will now work.
2012-11-17 20:13:29 +01:00
dfighter1985
d47c317728
CHANGED: #1471 Widget property templates are now stored in a tree. Also added some new controls to the widget property dialog.
2012-11-17 04:55:12 +01:00
dnk-88
199ee931d9
Changed: Fixed crash land editor qt
2012-11-11 13:33:43 +03: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
b78dfebff2
Changed: if-statements for context menu selection - no logic
2012-10-21 13:58:44 -07:00
mattraykowski
098c6b96eb
Changed: Enabled custom context menu signal to open a menu at the mouse position.
2012-10-21 13:48:02 -07:00
sfb
bc2ecb6023
GEQt Plugin: Starting to add the context menu back.
2012-10-18 20:56:31 -05:00
kervala
0698f1abc2
Changed: Replaced string empty comparisons with empty()
2012-10-06 18:17:57 +02:00
sfb
a419c51a81
Changed: #1306 Fixed index bug with form array rename.
2012-09-28 09:50:44 -05:00
sfb
e918468ef8
Changed: #1306 Moved creation of undo command for form array renames to the model.
2012-09-28 07:33:51 -05:00
kervala
95d4d5972e
Changed: #825 Remove all warnings when compiling Ryzom
2012-09-27 22:25:00 +02:00
kervala
2d5142844a
Changed: Use *_PREFIX instead of fixed values with INSTALL
2012-09-27 22:11:26 +02:00
sfb
02a9f4d920
Added: #1306 Added undo/redo action for renaming array entry names
2012-09-27 08:22:50 -05:00
kervala
ae1118744c
Changed: Use RYZOM_SHARE_PREFIX as prefix to look for leveldesign data
2012-09-26 12:53:03 +02:00
kervala
bc477d7d8a
Changed: #1254 Error while compiling with current stable squish
2012-09-25 13:20:37 +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
kervala
d45a4122b8
Fixed : #1254 Error while compiling with current stable squish
2012-09-25 12:19:13 +02:00
kervala
fee16b7e0f
Changed: Plugins specs and plugins installation
2012-09-24 14:02:33 +02:00
kervala
5b6e448bde
Fixed: OVQT plugins loading under Unices (in the order: local, OVQT plugins, system)
2012-09-24 09:52:35 +02:00
kervala
dd64516b58
Changed: Homogeneous carriage returns
2012-09-24 09:49:52 +02:00
kervala
e05bd06a75
Changed: Fixed plugins specs name to install
2012-09-24 08:56:49 +02:00
kervala
45fe25eb98
Changed: Install plugins specs in ${NL_SHARE_PREFIX}/object_viewer_qt/plugins under Linux
2012-09-24 08:25:47 +02:00
kervala
dd05b36f99
Changed: Use "lib" prefix under unices for plugins
2012-09-23 23:58:03 +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
sfb
51705fd800
Changed: #1306 Radically changed the plugin in a new branch to match the way classic GE loads forms.
...
- Refactored the tree view to show only structs, arrays, vstructs and eliminated atoms from its view.
- Refactored the form view to have a Qt Properties Browser
- Refactored the loader to use the classic GE addStruct/addArray.
- Moved some functionality into CFormItem.
- Added icons from classic GE and configured model/item to return them appropriately.
- Getting read for changes via undo commands.
- Eliminating/ignoring the hold/slots business from classic GE code.
2012-09-20 16:39:21 -05:00