aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 01:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7579 commits 14 branches 0 tags 258 MiB
Commit graph

472 commits

Author SHA1 Message Date
kervala
079e7bdc6b Changed: Use _T macro and TCHAR to support UNICODE 2016-11-19 21:07:20 +01:00
kervala
888b27f87a Changed: Macros to convert to/from TCHAR* and std::string 2016-11-19 19:46:40 +01:00
kervala
8dd3157847 Fixed: Typos detected by Lintian 2016-11-19 19:11:12 +01:00
kervala
a0b502c752 Changed: Use _T macro and TCHAR to support UNICODE 2016-11-17 10:55:21 +01:00
kervala
68eb6448fb Changed: Minor changes 2016-11-17 10:30:59 +01:00
kervala
840aaba5d4 Changed: Constify some methods 2016-11-15 10:58:51 +01:00
kervala
0ed01470b0 Changed: 3dsmax 2013 and up are always using Unicode 2016-11-15 10:55:41 +01:00
kervala
12d475bb75 Changed: Use _T macro and TCHAR to support UNICODE 2016-11-15 10:39:22 +01:00
Nimetu
e529295ca4 Merge with develop 2016-11-13 23:07:03 +02:00
Nimetu
92b01796a0 Fixed: Crash when <select> element was without <form> 2016-11-13 23:06:35 +02:00
kervala
4438ab108c Merge with develop 2016-11-07 14:12:11 +01:00
kervala
95dd3ce9d0 Changed: Discard \r and only use \n 2016-11-04 20:22:10 +01:00
kervala
8bb023850c Changed: Only put a space if several conditions 2016-11-04 20:21:18 +01:00
kervala
5a7d6b43e4 Changed: Minor changes 2016-11-04 20:20:39 +01:00
kervala
2a0b6086ab Changed: ForceUtf8 parameter useless now 2016-11-04 20:19:41 +01:00
kervala
328da50ed2 Merge with develop 2016-11-03 15:23:32 +01:00
kervala
e8f63841a6 Changed: Minor changes 2016-11-03 15:23:08 +01:00
kervala
88c53b147d Fixed: Only release NSAutoreleasePool once at the end 2016-11-03 15:22:59 +01:00
kervala
9f434db97b Merge with develop 2016-10-31 19:03:04 +01:00
kervala
4bb2195a79 Fixed: Update libovr detection 2016-10-31 19:00:19 +01:00
kervala
7a1a082135 Merge with develop 2016-10-30 16:52:02 +01:00
kervala
e3f19b09c4 Changed: Don't need to put \n in nlwarning 2016-10-30 16:00:27 +01:00
kervala
d84b5f9bf4 Changed: Use empty() instead of comparison with "" 2016-10-30 15:59:20 +01:00
kervala
e752b52ec4 Changed: Use clear() instead of affectation 2016-10-30 15:56:41 +01:00
kervala
0a3f64c644 Fixed: Translations files are all using UTF-8 by default now (and LF instead of CRLF), fixes #128 2016-10-29 19:50:28 +02:00
kervala
7b86bca098 Fixed: Catch exception when calling [NSApp sendEvent:event] and log it 2016-10-29 15:52:06 +02:00
kervala
92f4377eb4 Changed: Minor changes 2016-10-29 15:51:07 +02:00
kervala
0cfd8cb35d Merge with develop 2016-10-27 16:48:45 +02:00
kervala
366a576443 Changed: Simplified all ENDIF and ELSE 2016-10-27 10:54:09 +02:00
kervala
956da7f9da Merge with develop 2016-10-25 17:41:54 +02:00
kervala
e9ca788d0d Changed: Don't spam player with that 2016-10-25 17:41:03 +02:00
kervala
26dd86f5a6 Changed: Properly initialize all members of SLetterInfo and SLetterKey to avoid crashes when accessing to them 2016-10-25 16:05:05 +02:00
kervala
fcd8ba8b4f Changed: When shape is a pacs_prim file, don't put "Not found" message 2016-10-25 16:04:06 +02:00
kervala
2fdcd7d27f Changed: Use empty() to check if a string is empty 2016-10-25 15:52:14 +02:00
kervala
df676ede7e Merge with develop 2016-10-25 11:50:27 +02:00
kervala
c0a63db70c Changed: Display a warning when SetWindowTextW fails 2016-10-25 11:49:46 +02:00
kervala
f1b0d8cc58 Changed: Use FMod driver by default under Windows (to verify if it's fixing crash when teleporting) 2016-10-24 13:54:06 +02:00
kervala
627dea4a06 Merge with develop 2016-10-23 16:29:49 +02:00
kervala
b1fb6d2ec2 Changed: New format/f parameter for build_interface to force a format (png or tga) 2016-10-23 16:28:51 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
d677eadabe Changed: Minor changes 2016-10-22 16:52:34 +02:00
kervala
413e5422f2 Fixed: Ignore extension when looking for textures 2016-10-22 16:52:20 +02:00
kervala
18e35134a0 Changed: Write UNIX EOL in UV files 2016-10-22 16:50:31 +02:00
kervala
8fe387eae3 Changed: Allow to extract interface elements with build_interface 2016-10-22 16:49:57 +02:00
kervala
5b90453bde Changed: Typo 2016-10-22 16:49:19 +02:00
kervala
cf05a2068b Fixed: Return an error when a required argument is missing 2016-10-22 16:49:12 +02:00
kervala
7d4833b37e Changed: Implement and use CBitmap::makeTransparentPixelsBlack() 2016-10-22 16:47:25 +02:00
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
kervala
486282262e Changed: Return error message as an UTF-8 string 2016-10-21 12:55:02 +02:00
kervala
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00
kervala
86f66e678d Changed: Replace sscanf by fromString 2016-10-20 12:34:38 +02:00
kervala
b639b89169 Changed: Minor changes 2016-10-20 12:34:25 +02:00
kervala
58c46d6815 Changed: Replace sscanf by fromString 2016-10-20 12:33:37 +02:00
kervala
f8b7833e24 Fixed: Wrong syntax for NL_I64 2016-10-20 12:22:57 +02:00
kervala
80cbda23e5 Merge with develop 2016-10-18 10:27:44 +02:00
kervala
b65389487a Changed: Minor change 2016-10-18 10:27:09 +02:00
kervala
8a52b34e09 Merge with develop 2016-10-17 11:49:38 +02:00
kervala
bf9beced02 Fixed: Call Cocoa API when required to not conflict with Qt 2016-10-17 11:48:58 +02:00
kervala
6f79d27969 Changed: Minor change 2016-10-17 11:24:49 +02:00
kervala
6fc8853d51 Merge with develop 2016-10-15 17:16:34 +02:00
kervala
e88a317f42 Fixed: Deadlock while calling CoUninitialize() 2016-10-15 17:11:53 +02:00
kervala
35b59843cf Merge with develop 2016-10-10 18:55:28 +02:00
kervala
24e8cd252b Changed: Fix english comment 2016-10-10 18:53:11 +02:00
kervala
8fd439eb34 Merge with develop 2016-10-01 18:43:48 +02:00
kervala
be66ef0ab7 Changed: Implement AlphaLuminance resample 2016-10-01 18:43:08 +02:00
kervala
6744ded402 Merge with develop 2016-09-28 23:55:21 +02:00
kervala
468c3aa7d0 Fixed: Connexion -> Connection typo 2016-09-28 23:42:01 +02:00
kervala
c1439da922 Merge with develop 2016-09-25 10:50:38 +02:00
kervala
d9cf3e4182 Changed: Add a new line after description 2016-09-25 10:50:13 +02:00
kervala
9b5a631337 Changed: Remove alternative formats for parameters (too verbose) 2016-09-25 10:49:55 +02:00
kervala
e1555f9e24 Merge with develop 2016-09-24 15:54:47 +02:00
kervala
6ef43342bc Fixed: tga2dds doesn't generate mipmaps 2016-09-24 15:54:28 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
kervala
10d624989c Changed: Generate an exception if file is not a supported bitmap format 2016-09-24 14:19:35 +02:00
kervala
db718f9a40 Merge with develop 2016-09-23 13:32:12 +02:00
kervala
5ea89b63d9 Changed: Factorize saving to right bitmap format 2016-09-23 13:31:41 +02:00
kervala
1fe1079f2e Changed: Minor changes 2016-09-23 13:29:50 +02:00
kervala
263bf36347 Changed: Simplify outString (a simple printf should be enough) 2016-09-23 13:29:00 +02:00
kervala
79e4569c74 Changed: Use CCmdArgs for build_interface 2016-09-23 13:26:55 +02:00
Nimetu
e146348e03 Merge with develop 2016-09-21 20:12:51 +03:00
Nimetu
5198501b82 Added: Lua function to render html string as new webpage 2016-09-21 20:11:13 +03:00
kervala
2455fc02d7 Merge with develop 2016-09-19 14:52:47 +02:00
kervala
fcdc100204 Fixed: Compilation without PCH 2016-09-19 14:34:49 +02:00
kervala
e68258e56e Merge with develop 2016-09-16 19:25:17 +02:00
kervala
b35c6f921b Changed: Only call CoUninitialize if CoInitialize(Ex) succeeded 2016-09-16 19:24:43 +02:00
kervala
89ab635693 Merge with develop 2016-09-12 14:39:38 +02:00
kervala
e4c94e48c1 Fixed: Compilation under OS X in 32 bits 2016-09-12 14:39:07 +02:00
kervala
43c68bc97b Changed: Updated glext.h 2016-09-12 14:38:49 +02:00
kervala
8c0af53b48 Merge with develop 2016-09-03 10:15:39 +02:00
kervala
370b95a876 Fixed: Compilation under macOS 10.12 2016-09-03 10:04:56 +02:00
kervala
f700371058 Changed: Initialize ARBFragmentShader to false if DisableHardwarePixelProgram is set 2016-09-03 10:04:09 +02:00
kervala
d45d684ce7 Changed: Get length of song in FMod driver too (issue #59) 2016-09-03 10:03:33 +02:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
Nimetu
848374b5ef Changed: Also return song length with title 2016-08-30 21:25:46 +03:00
kervala
8af64c9e71 Merge with develop 2016-08-06 20:12:39 +02:00
kervala
f6163b96c9 Fixed: Include initguid.h to avoid linking against dxguid.lib 2016-08-06 20:09:40 +02:00
Nimetu
70aa8676c2 Merge with develop 2016-07-25 19:27:04 +03:00
Nimetu
3ae34e7786 Fixed: Bad typo 2016-07-25 19:26:49 +03:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
5b0699bc84 Added: font style to <pre> element 2016-07-24 16:07:36 +03:00
Nimetu
007e4c4e92 Added: font-family style option 2016-07-24 16:07:31 +03:00
Nimetu
ef645bfa21 Added: Monospace font options 2016-07-24 16:07:18 +03:00
Nimetu
df7cc78791 Changed: Support custom font 2016-07-24 16:05:04 +03:00
Nimetu
6fc2f7d603 Added: Possible to use multiple fonts at the same time 2016-07-24 16:03:37 +03:00
Nimetu
0be0a1e9e7 Merge with develop 2016-07-23 11:28:22 +03:00
Nimetu
bcc5ea56b8 Fixed: Double tooltip on web image links 2016-07-20 14:31:44 +03:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
kervala
a7f1e4e8e8 Changed: Don't need to hardcode a text offset because the old font was not aligned 2016-06-26 19:40:10 +02:00
kervala
2098aaece5 Fixed: The height of a CViewText was wrong in some cases because "|" is not the tallest character of the current font (ryzom.ttf) 2016-06-26 15:17:32 +02:00
Nimetu
975ed523be Merge with develop 2016-06-25 22:30:51 +03:00
Nimetu
aa32c25e56 Added: HTML css hsl(), hsla() color 2016-06-25 22:28:48 +03:00
Nimetu
f7cd50065f Added: HTML css rgb() and rgba() color 2016-06-25 19:32:43 +03:00
Nimetu
44abf90861 Added: HTML #RGBA color 2016-06-25 18:17:53 +03:00
Nimetu
07a1f2000a Fixed: Inconsistent html color parsing 2016-06-25 17:45:21 +03:00
kervala
ad98793560 Merge with develop 2016-06-19 21:10:23 +02:00
kervala
f2a91e8bb4 Changed: Init CSystemUtils in INelContext 2016-06-19 20:48:30 +02:00
kervala
f54109d279 Merge with develop 2016-06-18 22:41:12 +02:00
kervala
24ca4f3e97 Changed: Under Linux, it's recommended to put user application data in ~/.local/share 2016-06-18 19:47:05 +02:00
kervala
41ef412c0c Merge with develop 2016-06-16 17:16:27 +02:00
kervala
bb1dfa3a9d Changed: Only display virtual screen size if DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag is defined 2016-06-16 17:15:45 +02:00
kervala
e23f460baf Changed: Only display this message in debug 2016-06-16 17:14:48 +02:00
kervala
e22cc2acf2 Merge with develop 2016-06-14 20:18:10 +02:00
kervala
94ef359129 Fixed: Usage of wglEnumGpuDevicesNV 2016-06-14 19:34:43 +02:00
kervala
0734682f3d Changed: Updated OpenGL headers 2016-06-14 19:33:41 +02:00
kervala
3ae8a19af1 Merge with develop 2016-06-12 15:44:48 +02:00
kervala
218bc058d0 Changed: Replaced spaces by tabs 2016-06-12 14:17:36 +02:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
Nimetu
a2d9be979d Fixed: Keep \n inside <textarea> 2016-06-12 12:46:44 +03:00
Nimetu
d05b77ff8e Changed: CSS inherit value for some properties 2016-06-12 12:46:42 +03:00
Nimetu
c8798be3cb Changed: Set <textarea>, <input> font style 2016-06-12 10:30:16 +03:00
Nimetu
abffc7604a Added: Rows attribute to <textarea> element 2016-06-12 10:22:22 +03:00
Nimetu
ce5d7e5e59 Added: Minimum lines option to multiline text 2016-06-12 10:22:22 +03:00
kervala
a096a9ccff Merge with develop 2016-06-07 20:01:47 +02:00
kervala
95e07ec249 Fixed: Support for all Windows 10 products types 2016-06-07 20:01:18 +02:00
kervala
d5b086b0c8 Merge with develop 2016-06-04 17:05:41 +02:00
kervala
f6f42d7953 Fixed: Error 18 when moving a file between different file systems 2016-06-04 17:00:40 +02:00
Nimetu
dca7c1f40b Merge with develop 2016-06-04 10:36:21 +03:00
kervala
d6fc8af573 Merge with develop 2016-05-30 17:51:54 +02:00
kervala
ac448eac18 Merge with develop 2016-05-27 22:24:20 +02:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
Nimetu
9479bf3ee8 Fixed: Send user-agent string and cookies with image request. 2016-05-25 12:08:12 +03:00
Nimetu
72daa060c4 Changed: Move addLink code to beginElement 2016-05-25 12:08:08 +03:00
Nimetu
5c7f7e9337 Changed: minor changes 2016-05-25 12:08:06 +03:00
kervala
cf657d9374 Fixed: Read NeL crash reports as UTF-8 files 2016-05-30 17:51:19 +02:00
kervala
914d0eca9f Changed: No need to change VSync if same value 2016-05-27 22:16:44 +02:00
kervala
f1a7d0aa5f Changed: Display a warning if setSwapVBLInterval is called before OpenGL initialization 2016-05-27 22:16:29 +02:00
kervala
e107ca053d Changed: Instead of forcing VSYNC, get initial value 2016-05-27 22:15:58 +02:00
kervala
c024b18fbe Fixed: VSync inverted under Windows and in OpenGL ES 2016-05-27 22:15:14 +02:00
kervala
54076e9bf1 Changed: Use uint instead of unsigned 2016-05-25 23:19:46 +02:00
kervala
23866079be Changed: Replace size() comparisons by empty() 2016-05-25 23:18:11 +02:00
Nimetu
13bef3b94d Merge with develop 2016-05-14 13:47:03 +03:00
Nimetu
1d0b3077f6 Changed: Remove legacy HTTPCurrentDomain variable 2016-05-14 12:53:09 +03:00
Nimetu
0d3c81dde1 Fixed: Parsing url authority when path is empty 2016-05-14 12:53:09 +03:00
Nimetu
08a2506286 Changed: Rename CUrlParser domain variable 2016-05-14 12:53:09 +03:00
kervala
673fb8d52a Merge with develop 2016-05-13 20:55:24 +02:00
Nimetu
8c7086fa9d Merge with develop 2016-05-13 13:58:33 +03:00
Nimetu
932acf2e11 Merge with develop 2016-05-09 20:14:15 +03:00
kervala
7bcf3bfe5c Merge with develop 2016-05-08 19:24:04 +02:00
kervala
bf79b16b5b Merge with develop 2016-05-08 13:42:53 +02:00
Nimetu
3530beb7fe Merge with develop 2016-05-05 15:01:10 +03:00
Nimetu
a26d4063f7 Merge with develop 2016-04-23 18:49:52 +03:00
kervala
77927a2558 Merge with develop 2016-04-15 16:12:32 +02:00
kervala
9c3dc650e7 Backed out changeset: 44cd3beacab6 2016-04-14 18:56:48 +02:00
kervala
45565e2bb8 Changed: Temporary checks for a OS X 10.7 bug... 2016-04-14 18:19:19 +02:00
kervala
910c6dc7b9 Merge with develop 2016-04-12 15:43:47 +02:00
kervala
208e02b31e Merge with develop 2016-04-06 09:34:34 +02:00
kervala
587804cab7 Merge with develop 2016-04-02 13:32:28 +02:00
kervala
e29d08861d Merge with develop 2016-04-02 11:34:39 +02:00
kervala
2d5cf29861 Merge with develop 2016-03-20 17:28:00 +01:00
kaetemi
4bdca3e82e Merge with develop 2016-03-19 22:34:32 +01:00
kervala
5109ae5443 Merge with develop 2016-03-19 19:30:06 +01:00
kervala
dc52b3e24f Merge with develop 2016-03-19 16:21:46 +01:00
kervala
371cba9a84 Merge with develop 2016-03-18 22:27:43 +01:00
kervala
63b2843232 Merge with develop 2016-03-18 22:16:28 +01:00
kervala
f192068bc4 Merge with develop 2016-03-16 19:15:11 +01:00
kervala
0e1cbe909c Merge with develop 2016-03-15 12:37:11 +01:00
kaetemi
4eb9d884d0 Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
eb8835c36c Merge with develop 2016-03-08 12:46:47 +01:00
kervala
417b72447c Changed: Temporarily disable Spanish and Russian translations (not yet ready) 2016-03-05 12:45:49 +01:00
Nimetu
526a716948 Merge with develop 2016-03-03 00:00:30 +02:00
Nimetu
94d2d95efa Merge with develop 2016-03-01 22:39:10 +02:00
kervala
ea7463afc0 Merge with develop 2016-02-28 16:46:11 +01:00
kervala
379af19bd9 Merge with develop 2016-02-28 12:46:34 +01:00
kervala
207f749a93 Merge with develop 2016-02-27 19:22:53 +01:00
kervala
24cfde8037 Merge with develop 2016-02-27 18:39:41 +01:00
kervala
75199aad21 Merge with develop 2016-02-23 17:05:57 +01:00
kervala
9b53b815f7 Merge with develop 2016-02-21 20:30:16 +01:00
kervala
c4b768833b Merge with develop 2016-02-21 13:22:22 +01:00
kervala
0350c97f0a Merge with develop 2016-02-20 19:29:00 +01:00
kervala
708c5d0d41 Merge with develop 2016-02-15 12:11:08 +01:00
kervala
ed8afa1b6c Merge with develop 2016-02-14 19:59:16 +01:00
kervala
17e86cce21 Merge with develop 2016-02-14 19:16:53 +01:00
kervala
08e9906e0d Merge with develop 2016-02-14 18:21:41 +01:00
Nimetu
02d706092b Merge with develop 2016-02-14 01:24:10 +02:00
kervala
3ab60af016 Merge with develop 2016-02-13 23:43:04 +01:00
kervala
5bf0b023e3 Merge with develop 2016-02-13 14:00:02 +01:00
kervala
7212a8e360 Merge with develop 2016-02-12 16:05:43 +01:00
kervala
3a5c2da73d Merge with develop 2016-02-11 21:01:27 +01:00
kervala
06bfd577a4 Merge with develop 2016-02-10 18:48:09 +01:00
kervala
4bfacefdd8 Merge with develop 2016-02-05 12:30:26 +01:00
kervala
cb4c93648e Merge with develop 2016-02-04 14:33:30 +01:00
kervala
59dcd867e9 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
0880232caa Merge with develop 2016-02-02 19:51:11 +01:00
kervala
c85cbfc869 Merge with develop 2016-02-02 19:31:12 +01:00
kervala
4808dfcecb Merge with develop 2016-02-02 12:37:59 +01:00
kervala
058b36aa4a Merge with develop 2016-02-01 09:07:45 +01:00
kervala
9febb7374a merge with develop 2016-01-28 13:27:35 +01:00
kervala
fabef15e80 Merge with develop 2016-01-27 13:30:49 +01:00
kervala
8083f47f35 Merge with develop 2016-01-26 23:43:34 +01:00
kervala
0f3a4cb78e Merge with develop 2016-01-26 23:30:48 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +01:00
kervala
b9a761925b Merge with develop 2016-01-23 19:07:13 +01:00
kervala
56f56def72 Merge with develop 2016-01-23 13:03:27 +01:00
kervala
9e3ef029c6 Merge with develop 2016-01-23 12:30:33 +01:00
kervala
40719ddda8 Merge with develop 2016-01-23 10:59:56 +01:00
kervala
f8ceec9e3d Merge with develop 2016-01-23 10:28:00 +01:00
kervala
39e8135a82 Merge with develop 2016-01-23 10:19:01 +01:00
kervala
11f2f1e3e1 Merge with develop 2016-01-21 10:08:56 +01:00
Nimetu
493329ca7f Merge with develop 2016-01-20 19:15:45 +02:00
kervala
567ddba324 Merge with develop 2016-01-19 20:42:11 +01:00
kervala
eea12f5170 Merge with develop 2016-01-18 21:48:31 +01:00
kervala
63984e4a2a Merge with develop 2016-01-18 21:32:01 +01:00
kervala
19ab8294bb Merge with develop 2016-01-17 13:24:01 +01:00
kervala
6995adfbc7 Merge with develop 2016-01-16 23:50:23 +01:00
kervala
8bda57bf89 Merge with develop 2016-01-16 15:58:19 +01:00
kervala
628c2b1d80 Merge with develop 2016-01-16 10:52:18 +01:00
kervala
a0d2adcc90 Merge with develop 2016-01-14 23:58:34 +01:00
kervala
e32543564d Merge with develop 2016-01-14 23:54:26 +01:00
kervala
130847cac5 Merge with develop 2016-01-14 21:28:47 +01:00
kervala
6a5fc56ce0 Merge with develop 2016-01-13 20:05:06 +01:00
kervala
8d905df095 Merge with develop 2016-01-12 22:32:22 +01:00
kervala
1b7db1e92d Merge with develop 2016-01-11 11:44:44 +01:00
Nimetu
4158e851a9 Merge with develop 2016-01-10 16:34:13 +02:00
kervala
a8e28a20b4 Merge with develop 2016-01-10 12:13:59 +01:00
kervala
e0e990566c Merge with develop 2016-01-09 16:32:59 +01:00
kervala
48757c15b7 Merge with develop 2016-01-09 16:08:34 +01:00
kervala
989569c137 Merge with develop 2016-01-07 17:41:02 +01:00
kervala
df6397132f Merge with develop 2016-01-06 23:22:57 +01:00
kervala
63a6f0f837 Merge with develop 2016-01-06 16:06:23 +01:00
kervala
88226323e0 Merge with develop 2016-01-06 13:22:47 +01:00
Nimetu
378b520048 Merge with develop 2016-01-06 01:02:22 +02:00
kervala
4520020f3b Merge with develop 2016-01-05 17:12:29 +01:00
kervala
d46d1e45ad Merge with develop 2016-01-05 13:00:18 +01:00
kervala
e5a1249cb8 Merge with develop 2016-01-04 22:17:00 +01:00
kervala
b02956196d Merge with develop 2016-01-04 19:27:21 +01:00
kervala
477759217b Merge with develop 2016-01-04 16:15:03 +01:00
kervala
7de5594966 Merge with develop 2016-01-04 15:41:29 +01:00
kervala
a6694d122b Merge with develop 2016-01-04 14:03:11 +01:00
kervala
a046a06db3 Merge with develop 2016-01-03 18:16:07 +01:00
kervala
50b846d56c Merge with develop 2016-01-02 22:36:05 +01:00