This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 3b19bd2b572342560689f732bc595a2f9c64e965 Mon Sep 17 00:00:00 2001 | |
From: =?UTF-8?q?Ezequiel=20Pereira=20L=C3=B3pez?= <[email protected]> | |
Date: Sun, 20 Dec 2015 09:40:48 -0300 | |
Subject: [PATCH] Added Merge and Split options as actions | |
* Now the Merge and Split options can be accessed directly as actions | |
--- | |
src/af/xap/cocoa/xap_CocoaTools.h | 12 ++++++------ | |
src/wp/ap/xp/ap_Toolbar_ActionSet.cpp | 15 +++++++++++---- | |
2 files changed, 17 insertions(+), 10 deletions(-) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/usr/bin/cmake -H/home/ezequiel/Desktop/Space-game -B/home/ezequiel/Desktop/Space-game/build --check-build-system CMakeFiles/Makefile.cmake 0 | |
/usr/bin/cmake -E cmake_progress_start /home/ezequiel/Desktop/Space-game/build/CMakeFiles /home/ezequiel/Desktop/Space-game/build/CMakeFiles/progress.marks | |
make -f CMakeFiles/Makefile2 all | |
make[1]: Entering directory '/home/ezequiel/Desktop/Space-game/build' | |
make -f CMakeFiles/game.dir/build.make CMakeFiles/game.dir/depend | |
make[2]: Entering directory '/home/ezequiel/Desktop/Space-game/build' | |
cd /home/ezequiel/Desktop/Space-game/build && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /home/ezequiel/Desktop/Space-game /home/ezequiel/Desktop/Space-game /home/ezequiel/Desktop/Space-game/build /home/ezequiel/Desktop/Space-game/build /home/ezequiel/Desktop/Space-game/build/CMakeFiles/game.dir/DependInfo.cmake --color= | |
Dependee "/home/ezequiel/Desktop/Space-game/build/CMakeFiles/game.dir/DependInfo.cmake" is newer than depender "/home/ezequiel/Desktop/Space-game/build/CMakeF |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/home/ezequiel/Desktop/Space-game/src/main.cpp:21:15: error: expected initializer before ‘window_resized’ | |
void GLFWCALL window_resized(int width, int height); | |
^ | |
/home/ezequiel/Desktop/Space-game/src/main.cpp: In function ‘int main()’: | |
/home/ezequiel/Desktop/Space-game/src/main.cpp:40:66: error: ‘glfwOpenWindowHint’ was not declared in this scope | |
glfwOpenWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); | |
^ | |
/home/ezequiel/Desktop/Space-game/src/main.cpp:42:21: error: ‘GLFW_OPENGL_VERSION_MAJOR’ was not declared in this scope | |
glfwOpenWindowHint(GLFW_OPENGL_VERSION_MAJOR, 3); | |
^ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-- Petición -- | |
POST /buses/rest/stm-online HTTP/1.1 | |
Host: www.montevideo.gub.uy | |
Content-Type: application/json | |
Content-Length: <LENGTH> | |
Notas: | |
- Es OBLIGATORIO setear la cabecera "Content-Type" con el valor "application/json" | |
- Es OBLIGATORIO hacer la petición por HTTP, no HTTPS |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
POST /stmonlineRest/nextETA HTTP/1.1 | |
Host: m.montevideo.gub.uy | |
Content-Type: application/json | |
Content-Length: 100 | |
{ | |
"variante": [], | |
"parada": 1192, | |
"linea": ["526","G","148","329"], | |
"cantPorLinea": 3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
syntax = "proto3"; | |
enum OperationStatus { | |
UNKNOWN_STATUS_0 = 0; | |
UNKNOWN_STATUS_1 = 1; | |
UNKNOWN_STATUS_2 = 2; | |
DONE = 3; | |
} | |
message Operation { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
EndUserCreds 1 BxiMqwEY1SgYpugDGK2lBRjB_wEYn1oYweoCGPB5GL8FGLSfASoJYW5vbnltb3VzSIXkk8LTCVKDAQi5xsPDqAgSLjMzMTY1NjUyNDI5M0BjbG91ZHNlcnZpY2VzLmdzZXJ2aWNlYWNjb3VudC5jb20gASgAQABbYi4zMzE2NTY1MjQyOTNAY2xvdWRzZXJ2aWNlcy5nc2VydmljZWFjY291bnQuY29tXKsB2AbzAuAGAawB6goGkAIBsAUBWP___________wFwAVphMhMKEQoIY2xvdWQtZG0Qg_z_h_8eSAFqDgoIY2xvdWQtZG0aAnZychUIBTIRCghjbG91ZC1kbRCD_P-H_x6CAQ8KBAgBEAASBwiF5JPC0wmSAQ4IBTIKCghjbG91ZC1kbZIBDwoECAEQABIHCIXkk8LTCagBucbDw6gIMoUCAE_SaXYiViKbsWJ05GxMNvfEhEoZbbXGubN9kNRSdDpyXfCRX8VS0Ic4IN8ZV2oaIcI9RsnKC7L-DcZrtBkXORWaLhdYh1j06qKnkAfu-fB5zun4SNB6aZ9K0Nwc6ChOEgb192abW9-onn-gGebcm2gUqipDNldhoLkuGRIagm89oQJVpu8pRdyv1oL3PQF4CUppvO6LHWJfw8u3w7qf4WOWewY3Jq-m1qAjwEMvRCGmoibZFqCqLJ9k56JbSYkAWVopB2jI7ZbJ5VNrVcAAEe6FpqeoHNwZYIvOtkujecVNR-wfdyd9Ic0fS-DcOs4dgVFtIC5rtwwK0eIFmJbxfy31ScePShZjbG91ZGdhaWE6OnZqZ3Y3Mzo5ODk4 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
POST https://www.googleapis.com/deploymentmanager/staging_dogfood/projects/<PROJECT>/global/typeProviders?access_token=<TOKEN> HTTP/1.1 | |
{ | |
"name": "hack", | |
"descriptorUrl": "https://test-appengine.sandbox.googleapis.com/$discovery/rest?key=<KEY>", | |
"googleOptions": { | |
"gslbTarget": "blade:apphosting-admin-nightly", | |
"descriptorUrlServerSpec": "blade:apphosting-admin-nightly", | |
"ownershipKind": "GOOGLE", | |
"credentialType": "GAIAMINT", |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"auth": { | |
"oauth2": { | |
"scopes": { | |
"https://www.googleapis.com/auth/cloud-platform": { | |
"description": "View and manage your data across Google Cloud Platform services" | |
}, | |
"https://www.googleapis.com/auth/cloud-platform.read-only": { | |
"description": "View your data across Google Cloud Platform services" | |
}, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
POST https://www.googleapis.com/deploymentmanager/staging_dogfood/projects/<PROJECT>/global/typeProviders?access_token=<TOKEN> HTTP/1.1 | |
{ | |
"name": "hack", | |
"descriptorUrl": "https://<GSLB target's path to a descriptor document>", | |
"googleOptions": { | |
"gslbTarget": <GSLB target name>, | |
"descriptorUrlServerSpec": <GSLB target name>, | |
"ownershipKind": "GOOGLE", | |
"credentialType": "GAIAMINT", |
OlderNewer