Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into luajit
Browse files Browse the repository at this point in the history
  • Loading branch information
MCJack123 committed Jan 27, 2023
2 parents 519e4ac + 98ad739 commit 7d712f6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/termsupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ std::string termGetEvent(lua_State *L) {
lua_pushinteger(L, y);
lua_pushinteger(L, e.tfinger.fingerId);
switch (e.type) {
case SDL_FINGERDOWN: return "_CCPC_finger_tap";
case SDL_FINGERDOWN: return "_CCPC_finger_touch";
case SDL_FINGERUP: return "_CCPC_finger_up";
case SDL_FINGERMOTION: return "_CCPC_finger_drag";
}
Expand Down
2 changes: 1 addition & 1 deletion src/util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern "C" {

#define CRAFTOSPC_VERSION "v2.7.3-luajit"
#define CRAFTOSPC_CC_VERSION "1.102.2"
#define CRAFTOSPC_INDEV true
#define CRAFTOSPC_INDEV false

using path_t = std::filesystem::path;
namespace fs = std::filesystem;
Expand Down

0 comments on commit 7d712f6

Please sign in to comment.