archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity
16137 commits 5 branches 11 tags 1.3 GiB
Commit graph

3148 commits

Author SHA1 Message Date
Lioncash
21d039059e ControllerConfigDiag: Fix Linux builds 2014-12-01 03:53:32 -05:00
Lioncash
5e2888bff6 DolphinWX: Add new icon for the controller menu. 2014-12-01 03:50:44 -05:00
Lioncash
896304fd07 ControllerConfigDiag: Disable controller type changes if netplay or a movie is active. 2014-12-01 03:36:09 -05:00
Lioncash
7b54d8ad10 ControllerConfigDiag: Remove now obsolete TODOs 2014-12-01 03:36:08 -05:00
Lioncash
cad8ae3be1 WiimoteConfigDiag: Rename to ControllerConfigDiag. 2014-12-01 03:36:07 -05:00
Lioncash
e801fcead9 WiimoteConfigDiag: Unify controller menu with the GameCube controllers. 2014-12-01 03:36:04 -05:00
Lioncash
00dcaba37d WiimoteConfigDiag: Size the config buttons correctly 2014-12-01 03:36:02 -05:00
Lioncash
22c547f6fb WiimoteConfigDiag: Remove trailing whitespace 2014-12-01 03:36:01 -05:00
Lioncash
1791897815 WiimoteConfigDiag: Fix assertion problems on non-OSX OSes. 2014-12-01 03:35:59 -05:00
Lioncash
94d033020e WiimoteConfigDiag: Split UI sizer creation into their own functions. 2014-12-01 03:35:58 -05:00
Lioncash
d17a054e75 WiimoteConfigDiag: Move GameCube controller settings over 
Beginning of unifying the controller settings. No functionality yet.
 2014-12-01 03:35:57 -05:00
Lioncash
6df67bf38f Merge pull request #1597 from unknownbrackets/gcz-tweaks 
Tweaks to gcz compression / decompression
 2014-12-01 03:18:24 -05:00
Ryan Houdek
4a687f2641 Merge pull request #1616 from Sonicadvance1/asimd_is_neon 
[Android] Fix NEON detection with AArch64
 2014-11-30 15:41:28 -06:00
magumagu
a09283cf9f ISOProperties: show all paritions on property page. 2014-11-30 16:38:15 +01:00
Ryan Houdek
50582b1d74 [Android] Fix NEON detection with AArch64 
On AArch64 asimd is the new name for NEON.
This fixes a message on application start in Android about the device not supporting NEON.
If it's AArch64 then it supports NEON!
 2014-11-30 01:33:11 -06:00
Ryan Houdek
b689954a71 Update the android cmake toolchain to latest. 
To properly support 64bit architectures and clang we need the latest version.
 2014-11-30 01:05:37 -06:00
Lioncash
c2e5715034 Merge pull request #1601 from RachelBryk/wiimote-hotkey2 
Fix wiimote connect hotkeys.
 2014-11-28 19:50:13 -05:00
Ryan Houdek
ce059769f6 Merge pull request #1439 from Armada651/ogl-stereo-3d 
OGL: Stereoscopic 3D Support
 2014-11-28 11:45:38 -06:00
Rachel Bryk
df9ace0985 Fix wiimote connect hotkeys. 2014-11-28 08:55:19 -05:00
Unknown W. Brackets
f2f83a0c60 DolphinWX: Allow cancelling gcz compression. 2014-11-27 07:53:28 -08:00
Jules Blok
6d51455195 VideoConfig: Further optimize convergence and separation values and update their descriptions. 
Previous convergence distance was much too large.
 2014-11-27 16:19:26 +01:00
Jules Blok
b3c6602d06 OGL: Only show the options when stereoscopy was enabled in the INI file. 
We'll enable the stereoscopy options globally when it is ready for release.
 2014-11-27 16:17:37 +01:00
skidau
b806680eac Merge pull request #1522 from jcowgill/sfml-2.1 
Update / Port to SFML 2.1
 2014-11-26 12:33:03 +11:00
skidau
69bd1562e2 Merge pull request #1561 from comex/10.9 
Update OS X Requirement to 10.9 + fixes
 2014-11-26 12:31:28 +11:00
Lioncash
aa92797f93 Merge pull request #1582 from Stevoisiak/newImprovedFormatting 
More formatting and consistency fixes
 2014-11-25 12:41:32 -05:00
Lioncash
dcdd4e51f6 Merge pull request #1589 from lioncash/x11 
VideoOGL: Move X11 wxWidgets utilities to DolphinWX
 2014-11-25 12:41:00 -05:00
James Cowgill
a93f86330e Port dolphin to SFML 2.1 2014-11-25 16:44:38 +00:00
Pringo
217ca9ba2b http -> https for Wiki Seach 2014-11-24 22:06:41 -08:00
comex
759ea3bce7 Update Main.cpp version checks. 2014-11-25 00:27:13 -05:00
Lioncash
c0fd319295 VideoOGL: Move X11 wxWidgets utilities to DolphinWX 2014-11-24 21:15:52 -05:00
Gabriel Corona
5b9aeaa686 Use CLI argument for Linux perf JIT support 2014-11-24 23:30:29 +01:00
Stevoisiak
6da394a4d0 More formatting and consistency fixes 2014-11-24 17:16:59 -05:00
Jules Blok
f64aadd362 VideoConfig: Limit the StereoMonoEFBDepth option to the game ini and introduce a separate section for it. 2014-11-24 12:25:35 +01:00
Jules Blok
0f4d59f612 VideoConfig: Rename StereoFocalLength to StereoConvergence. 2014-11-24 11:58:38 +01:00
Jules Blok
a565317a6a VideoConfigDiag: Update convergence description. 
The switch to the Nvidia formula reversed this setting.
 2014-11-23 14:30:12 +01:00
Jules Blok
72c01e3083 VideoConfigDiag: Remove value labels. 2014-11-23 14:30:12 +01:00
Jules Blok
6e62dd3415 Add stereoscopy hotkeys. 2014-11-23 14:30:12 +01:00
Jules Blok
0f63186371 TextureCache: Add "Mono EFB Depth Copy" stereoscopy option. 2014-11-23 14:27:40 +01:00
Jules Blok
f3ddf37d07 VideoCommon: Switch to Nvidia stereoscopy offset formula. 2014-11-23 14:27:40 +01:00
Jules Blok
02ad1a36ea VideoConfigDiag: Update descriptions. 
Since we cannot accurately calculate the eye seperation or the focal length without headtracking these values are purely virtual.
 2014-11-23 14:27:40 +01:00
Jules Blok
6b2261deca VideoConfigDiag: Update descriptions of stereoscopy settings. 2014-11-23 14:27:39 +01:00
Jules Blok
f74d1b16ed OGL: Add Top-and-Bottom stereoscopy mode. 2014-11-23 14:27:39 +01:00
Jules Blok
1261bd02ca VertexShaderManager: Add stereoscopy options to swap the left and right eye. 2014-11-23 14:27:39 +01:00
Jules Blok
c3ad6e7820 PostProcessing: Add support for anaglyph stereoscopy mode. 2014-11-23 14:27:39 +01:00
Jules Blok
9b22e15180 VideoConfigDiag: Add stereoscopy options group. 2014-11-23 14:27:38 +01:00
Jules Blok
4fd943aedd VideoConfig: Limit the Stereo 3D option to the OpenGL backend. 2014-11-23 14:27:38 +01:00
Jules Blok
81e9004679 VideoConfigDiag: Add Stereo 3D option. 2014-11-23 14:23:41 +01:00
Lioncash
60e9301f40 Merge pull request #1586 from lioncash/ar 
DolphinWX: Fix button handling for AR codes and ISO patch removal.
 2014-11-22 17:42:21 -05:00
Lioncash
f73b6abdf5 DolphinWX: Fix patch removal 2014-11-22 17:25:14 -05:00
Lioncash
be2331b6f1 DolphinWX: Fix button handling for AR codes 2014-11-22 16:44:31 -05:00
Matthew Parlane
21e4e035cc Merge pull request #1281 from Stevoisiak/RenameEuRGB60 
Renamed EuRGB to PAL60
 2014-11-21 19:09:42 +13:00
comex
aa452f4fe8 Merge pull request #1576 from comex/osx-qt-build-fixes 
OS X Qt build fixes
 2014-11-20 12:11:43 -05:00
comex
ba4a763410 Move library aggregation into common CMakeLists.txt; add missing libs to DolphinQt. 
Fixes DolphinQt build (on OS X, anyway) when libav is enabled.
 2014-11-19 20:09:12 -05:00
comex
dd2c8c49b3 Merge pull request #1515 from RachelBryk/gpudeterminism-isoprops 
Add GPUDeterminismMode to isoproperties.
 2014-11-19 20:03:52 -05:00
comex
688b1e537e rename CopyDataIntoBundle target name to avoid wx/qt conflict 2014-11-19 14:53:51 -05:00
Steven Vascellaro
695bbac36a Removed SDK flag 
SDK is not an official Nintendo country code, and is not actually used
by any official software.
 2014-11-18 19:44:17 -05:00
Stevoisiak
f1a26ff654 Various country flag improvements 
* Added country flags for games from Netherlands and Spain
* Added separate category for Region Free games (Uses European flag as placeholder)
* Added missing country filter options in "show regions" menu
* Rearranged country filters for readability
* Incremented CACHE_REVISION

Also fixed various country filters not showing up as options in the "Show regions" menu.
 2014-11-18 19:44:16 -05:00
Stevoisiak
e7a82c4ded Renamed EuRGB60 to PAL60 2014-11-18 16:51:21 -05:00
Lioncash
f7d1943615 Merge pull request #1570 from lioncash/scale 
WxUtils: Get rid of GetCurrentBitmapLogicalScale
 2014-11-17 20:55:14 -05:00
Lioncash
3c23a9afc9 WxUtils: Get rid of GetCurrentBitmapLogicalScale 
wx now provides the means to query this.
 2014-11-17 20:16:33 -05:00
Dolphin Bot
dced84d440 Merge pull request #1564 from RachelBryk/freelook 
Make freelook hotkeys configurable.
 2014-11-17 20:44:48 +01:00
Lioncash
f78600ec9e Merge pull request #1562 from lioncash/host 
Host: Kill off GetRenderWindowSize
 2014-11-17 13:51:40 -05:00
Lioncash
b94dbca160 Host: Kill off GetRenderWindowSize 2014-11-17 13:44:49 -05:00
Rachel Bryk
ea11c446c2 Make freelook hotkeys configurable. 2014-11-16 22:00:56 -05:00
skidau
5143adac0e Merge pull request #1306 from i418c/freelook_fixes 
Freelook fixes
 2014-11-17 13:03:23 +11:00
i418c
92d4e38267 Changed the hotkeys to 1 and 2. Message in GUI changed to reflect this. 2014-11-16 10:39:54 -08:00
Lioncash
c0291d5b88 Merge pull request #1558 from comex/command-thread-mismatch 
Fix wxCommandEvent/wxThreadEvent subclass mismatch
 2014-11-16 00:03:35 -05:00
comex
37b14bdec9 Fix wxCommandEvent/wxThreadEvent subclass mismatch 
Regression by 3fed975bac caused netplay to
crash on OS X.  While I'm at it, fix the long-standing "unsafe i guess"
AddPendingEvent, since we depend on wx 3 now...
 2014-11-15 23:52:19 -05:00
Lioncash
5d2ca2dfcc Merge pull request #1554 from lioncash/unique 
ISOFile: Get rid of a delete call
 2014-11-15 20:27:59 -05:00
Lioncash
43b8749c60 Merge pull request #1555 from lioncash/ref 
WatchView: Pass string by reference in SetWatchName
 2014-11-15 18:02:10 -05:00
Lioncash
04ee0245e2 WatchView: Pass string by reference in SetWatchName 2014-11-15 14:06:12 -05:00
Lioncash
798a96bd2a ISOFile: Get rid of a delete call 2014-11-15 13:25:21 -05:00
skidau
cf8035e240 Merge pull request #1521 from RachelBryk/double 
Fix some double->float conversions.
 2014-11-15 23:31:47 +11:00
Lioncash
8f92059705 LogWindow: Fix the timer event bindings 2014-11-14 00:46:42 -05:00
Lioncash
e789920340 Merge pull request #1539 from Stevoisiak/newImprovedFormatting 
Various formatting and consistency fixes
 2014-11-13 23:05:46 -05:00
Stevoisiak
b25e1a2eb4 Various formatting and consistency fixes 2014-11-13 22:42:18 -05:00
Lioncash
3b2d605fb5 Merge pull request #1538 from Stevoisiak/netplayCleanup 
Removed "Dual Core [OFF]" from netplay warnings
 2014-11-13 21:53:30 -05:00
Stevoisiak
6bb9a909a2 Removed "Dual Core [OFF]" from netplay warnings 
Requested by JMC47
 2014-11-13 21:15:07 -05:00
skidau
1e5a232464 Merge pull request #1537 from lioncash/wx 
MemoryView: Fix a dealloc of a stack reference
 2014-11-14 13:00:21 +11:00
skidau
8af52f6c72 Merge pull request #1532 from RachelBryk/dot 
Fix the red dot not showing up in input config when pointing right.
 2014-11-14 12:59:28 +11:00
Lioncash
ffc00b42e9 MemoryView: Fix a dealloc of a stack reference 
stack allocation only works with the root menu. Any other children must be
heap allocated.

These however, will be freed by wxWidgets.
 2014-11-13 20:10:40 -05:00
Lioncash
5fb94230cd Merge pull request #1531 from lioncash/notebook 
FrameAui: Allow notebook tabs to be rearranged in the parent notebook.
 2014-11-13 01:37:22 -05:00
skidau
4ca39d173b Merge pull request #1530 from lioncash/ui-leaks 
DolphinWX: Eliminate some memory leaks
 2014-11-13 13:39:44 +11:00
Lioncash
cae3f0bde0 FrameAui: Allow notebook tabs to be rearranged in the parent notebook. 2014-11-11 21:07:39 -05:00
Rachel Bryk
463c4faf1c Add GPUDeterminismMode to isoproperties. 2014-11-11 20:19:19 -05:00
Rachel Bryk
e9cb629723 Fix some double->float conversions. 2014-11-11 14:14:22 -05:00
Rachel Bryk
a371635990 Fix the red dot not showing up in input config when pointing right. 2014-11-11 13:42:42 -05:00
Lioncash
892bbdade6 DolphinWX: Eliminate some memory leaks 
Since the menus aren't actually assigned a parent, they would not be freed by wx. Plus, these should have initially been constructed on the stack in the first place.
Technically any time someone right-clicked the game list they would be leaking memory.
 2014-11-11 09:50:16 -05:00
Lioncash
ec82f02580 NetPlayDiag: Get rid of unnecessary text limit check 
The text control is limited to 2000 characters on creation.
 2014-11-11 00:12:23 -05:00
Lioncash
3fed975bac NetPlayDiag: Get rid of event table 2014-11-10 23:38:20 -05:00
Lioncash
5891266e67 NetPlayDiag: Make the window title translateable 2014-11-10 23:26:56 -05:00
skidau
71d8165a86 Merge pull request #1518 from lioncash/evt 
DolphinWX: Kill off trivial event tables
 2014-11-11 11:55:49 +11:00
Matthew Parlane
b1d8ca4730 Install nogui executable to bindir 2014-11-10 07:53:11 +00:00
Lioncash
ac387031a4 DolphinWX: Kill off trivial event tables 
Also fixes some of the wonky stuff in Main where we would fire an event to do post-init stuff which isn't necessary anymore.
 2014-11-09 00:08:33 -05:00
Lioncash
210567a919 DolphinWX: Remove unnecessary forward declarations 2014-11-07 22:16:13 -05:00
Rachel Bryk
83a6d28603 Fix analog l/r with tas input. 2014-11-07 20:44:38 -05:00
skidau
a2fa679b2e Merge pull request #1507 from lioncash/event 
DolphinWX: Eliminate most usages of event tables in the debugger
 2014-11-08 12:26:52 +11:00
Lioncash
1a214f7deb Merge pull request #1511 from lioncash/https 
Main: Explicitly use the HTTPS site URL.
 2014-11-06 22:15:04 -05:00
Jasper St. Pierre
44b879dac2 Destroy OpenMP 2014-11-06 18:38:24 -08:00
Lioncash
7a1dca993f Main: Explicitly use the HTTPS site URL. 2014-11-06 21:37:55 -05:00
Lioncash
a1b44a9027 Merge pull request #1509 from lioncash/headers 
Remove unnecessary cstdarg header includes
 2014-11-06 20:58:13 -05:00
Lioncash
8959adefb2 Merge pull request #1506 from waddlesplash/dolphin-qt 
Dolphin[Qt|WX]: Miscellaneous cleanup.
 2014-11-06 20:55:44 -05:00
Lioncash
4c62bd2edb Remove unnecessary cstdarg header includes 2014-11-06 20:50:11 -05:00
Lioncash
f6b4b4dbba Merge pull request #1497 from lioncash/host 
Host: Kill off Host_SysMessage
 2014-11-06 20:41:53 -05:00
skidau
28228ee3ca Merge pull request #1496 from lioncash/wxify 
DolphinWX: wx-ify the unofficial version warning
 2014-11-07 12:33:50 +11:00
Augustin Cavalier
a96acea03c Dolphin[Qt|WX]: Miscellaneous cleanup. 
DolphinQt:
 * Make the connect() calls explicit, not automatic
 * Follow better naming convention for the QActions
 * Remove the Open action from the toolbar.
Dolphin[Qt|WX]:
 * Move the "Skip Bundle" option to the root CMakeLists so that both DolphinQt and DolphinWX can use it.
 2014-11-06 15:47:27 -05:00
Lioncash
ee22d091a0 DolphinWX: Eliminate most usages of event tables in the debugger. 
Moves things over to Bind.
 2014-11-05 23:03:06 -05:00
Lioncash
0e2f9114fc TASInputDlg: Narrow a variable scope in UpdateFromText 2014-11-05 13:52:03 -05:00
Lioncash
884ec2ed13 Host: Kill off Host_SysMessage 
Equivalent facilities already exist.
 2014-11-05 02:30:48 -05:00
skidau
2140ac15e4 Removed the DSP LLE on separate thread option. 
The DSP thread will be enabled if the game is an AX ucode game and if the host has more than two cores (not including hyperthreading).
 2014-11-05 17:42:42 +11:00
Lioncash
611f349429 DolphinWX: wx-ify the unofficial version warning 2014-11-04 23:13:25 -05:00
Lioncash
50f442ac31 Merge pull request #1485 from Stevoisiak/capitalizeMenuOptions 
Menu capitalization consistency
 2014-11-04 09:19:15 -05:00
skidau
dc63f8f461 Merge pull request #1471 from RachelBryk/reset-record 
Allow hard resets to be recorded in movies.
 2014-11-04 12:30:48 +11:00
Stevoisiak
1be1d60c09 Menu capitalization consistency 2014-11-03 14:03:39 -05:00
Rachel Bryk
f9495a484c Allow hard resets to be recorded in movies. 2014-11-03 00:30:29 -05:00
Rachel Bryk
114b0f5d94 Fix some warnings. 2014-11-02 22:39:20 -05:00
Rachel Bryk
2eac08aa30 Add nunchuk support to tas input. 2014-11-02 20:52:13 -05:00
Lioncash
a41397d5d7 Merge pull request #1475 from lioncash/bind 
TASInputDlg: Use Bind over Connect for event handling
 2014-11-02 20:38:15 -05:00
Jasper St. Pierre
dd0aadac97 MemoryWindow: Use p_pFakeVMEM, not the virtual mirror 
They point to the same contents, so there's no reason to use the
mirror. This lets us make all the mirrors static.
 2014-11-02 16:34:17 -08:00
comex
890b788633 Merge pull request #1467 from waddlesplash/dolphin-qt 
DolphinQt: Games now boot!
 2014-11-02 18:08:55 -05:00
Lioncash
444e4fe3cf TASInputDlg: Use Bind over Connect for event handling 2014-11-02 14:16:07 -05:00
Ryan Houdek
1c41acaddd Merge pull request #1264 from Stevoisiak/GCM-to-ISO 
Gcm to iso
 2014-11-02 11:29:41 -06:00
Ryan Houdek
b8cba759f4 Merge pull request #1398 from Stevoisiak/setDefaultISOFiletypes 
ConfigMain: Added missing filetypes to default ISO options
 2014-11-02 11:24:43 -06:00
Augustin Cavalier
29593d403b Move GLInterface to the OGL VideoBackend's directory. 2014-11-02 12:16:33 -05:00
Ryan Houdek
66f0ac2417 Merge pull request #1401 from Stevoisiak/updateResolutionTooltip 
VideoConfigDiag: Updated video resolution description
 2014-11-02 11:13:29 -06:00
Ryan Houdek
6e43562496 Merge pull request #1468 from Tilka/cleanup 
Small cleanup
 2014-11-02 11:02:35 -06:00
Ryan Houdek
2c602137b1 Merge pull request #1472 from lioncash/i18n 
DolphinWX: Make the TAS dialog window titles translatable.
 2014-11-02 09:58:10 -06:00
Ryan Houdek
409b240c2e Merge pull request #1469 from Tilka/nogui_abort 
Reorder MainNoGUI shutdown
 2014-11-02 09:31:51 -06:00
Lioncash
3d83433e90 DolphinWX: Make the TAS dialog window titles translatable. 2014-11-02 02:11:40 -05:00
Lioncash
ca2391dd1e CheatSearchTab: Use a more specific event type for ApplyFocus 2014-11-02 00:30:02 -04:00
Tillmann Karras
ff41dd479b Fix warnings about non-static variables 2014-11-02 04:51:44 +01:00
Tillmann Karras
a248db0b65 Reorder MainNoGUI shutdown 
Before this change I always got this when closing dolphin-emu-nogui:

X Error of failed request:  BadWindow (invalid Window parameter)
  Major opcode of failed request:  10 (X_UnmapWindow)
  Resource id in failed request:  0x3400003
  Serial number of failed request:  215
  Current serial number in output stream:  219
terminate called without an active exception
Aborted
 2014-11-02 03:31:47 +01:00
skidau
86c100c442 Merge pull request #1442 from lioncash/wx 
CheatSearchTab: Improve localization possibilities for a string
 2014-11-01 12:26:08 +11:00
skidau
ef1520eab0 Merge pull request #1447 from skidau/Watches-bpRange-warning 
Fixed a warning in the add memcheck from Watch window
 2014-10-31 13:04:51 +11:00
skidau
e0c347527b Merge pull request #1446 from RachelBryk/accel2 
Fix wiimote accel.
 2014-10-31 13:04:37 +11:00
Rachel Bryk
b08d993b55 Fix wiimote accel. 2014-10-30 21:28:02 -04:00
skidau
dbddc5f8e2 Fixed a warning in the add memcheck from Watch window 2014-10-31 11:26:17 +11:00
Ryan Houdek
1ac9008243 Merge pull request #1436 from phire/DumbGetPointers 
Remove some dumb GetPointers.
 2014-10-30 12:59:09 -06:00
Stevoisiak
7a8a00f192 ConfigMain: Added missing filetypes to default ISO options 2014-10-30 13:51:48 -04:00
Lioncash
0216a4c5fe CheatSearchTab: Improve localization possibilities for a string 
Numbers might not always be right-aligned for every language.
 2014-10-29 23:19:24 -04:00
comex
eb22adf24a Merge pull request #1433 from rohit-n/fix-warnings 
DolphinWX: Fix a few warnings.
 2014-10-29 17:23:56 -04:00
Scott Mansell
3e47480470 Remove dumb getPointers that actually want the whole memory block. 
The whole memory block is accessable globally anyway. Much
cleaner!
 2014-10-29 23:51:27 +13:00
skidau
f426276b2e Merge pull request #1413 from Stevoisiak/moreFlags 
Added country flags for Russia and Australia
 2014-10-29 14:15:45 +11:00
Stevoisiak
00620ea729 Added flags for Russia and Australia 2014-10-28 23:04:24 -04:00
Rohit Nirmal
55f91ecba4 DolphinWX: Fix -Wsign-compare warnings. 2014-10-28 21:07:48 -05:00
Rohit Nirmal
b70a75776e DolphinWX: Remove unused variable. 2014-10-28 21:02:47 -05:00
skidau
1630b0c684 Merge pull request #1291 from skidau/debugger-step-out 
Dolphin debugger enhancements
 2014-10-28 12:53:22 +11:00
skidau
3f7a6e3eee Merge pull request #1405 from lioncash/mono 
CheatSearchTab: Make cheat list display in monospace font
 2014-10-28 12:47:21 +11:00
skidau
dd3cd30ee8 Merge pull request #1393 from RachelBryk/accel 
Fix acceleration emulation for wiimote and nunchuk.
 2014-10-28 12:46:37 +11:00
comex
5f4c22df1a Merge pull request #1423 from Buddybenj/cannot 
Fix consistency of cannot throughout the project
 2014-10-27 21:28:17 -04:00