API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jun 1st, 2017
526
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.22 KB | None | 0 0
raw download clone embed print report
  1. akion@quadra:~/Gamez/Xonotic/xonotic$ ./all update
  2. + cd /home/akion/Gamez/Xonotic/xonotic/.
  3. + git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic.git
  4. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  5. + git pull
  6. remote: Counting objects: 72, done.
  7. remote: Compressing objects: 100% (28/28), done.
  8. remote: Total 67 (delta 42), reused 57 (delta 39)
  9. Unpacking objects: 100% (67/67), done.
  10. From ssh://git.xonotic.org/xonotic
  11. ec5e922..659839d master -> origin/master
  12. Updating ec5e922..659839d
  13. Fast-forward
  14. all | 79 ++++++-----
  15. data/font-nimbussansl.pk3dir/font-nimbussansl.cfg | 14 ++
  16. .../fonts/NimbusSanL-Bold.ttf | Bin 0 -> 26280 bytes
  17. .../fonts/unifont-5.1.20080907.ttf | Bin 0 -> 16336376 bytes
  18. misc/tools/cached-converter.sh | 151 ++++++++++++++++++++
  19. misc/tools/jpeg-if-not-alpha.sh | 29 ----
  20. 6 files changed, 207 insertions(+), 66 deletions(-)
  21. create mode 100644 data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
  22. create mode 100644 data/font-nimbussansl.pk3dir/fonts/NimbusSanL-Bold.ttf
  23. create mode 100644 data/font-nimbussansl.pk3dir/fonts/unifont-5.1.20080907.ttf
  24. create mode 100755 misc/tools/cached-converter.sh
  25. delete mode 100755 misc/tools/jpeg-if-not-alpha.sh
  26. ./all has changed.
  27. Rerunning the requested operation to make sure.
  28. + cd /home/akion/Gamez/Xonotic/xonotic/.
  29. + git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic.git
  30. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  31. + git pull
  32. Already up-to-date.
  33. + git remote prune origin
  34. + cd /home/akion/Gamez/Xonotic/xonotic/data/xonotic-data.pk3dir
  35. + git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic-data.pk3dir.git
  36. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  37. + git pull
  38. Your configuration specifies to merge with the ref 'cbrutail/spacectf'
  39. from the remote, but no such ref was fetched.
  40. Pulling failed. Press ENTER to continue, or Ctrl-C to abort.
  41.  
  42. + git remote prune origin
  43. Pruning origin
  44. URL: ssh://xonotic@git.xonotic.org/xonotic-data.pk3dir.git
  45. * [pruned] origin/diabolik/exteriorweaponposition
  46. * [pruned] origin/diabolik/iqmmodelfix
  47. * [pruned] origin/diabolik/nexmodel
  48. * [pruned] origin/diabolik/pyriaplayermodel
  49. * [pruned] origin/diabolik/umbraplayermodel
  50. * [pruned] origin/diabolik/weaponscale
  51. * [pruned] origin/divVerent/menu-imprOOvements
  52. * [pruned] origin/divVerent/physics-test
  53. * [pruned] origin/fruitiex/newpanelhud_stable
  54. * [pruned] origin/mirceakitsune/highres_weapon_textures
  55. * [pruned] origin/samual/balanceSamual
  56. * [pruned] origin/samual/hittype_splash_on_inair_detonation
  57. * [pruned] origin/terencehill/numbered_bots
  58. * [pruned] origin/tzork/pathlib
  59. * [pruned] origin/tzork/weaponbalance1
  60. + cd /home/akion/Gamez/Xonotic/xonotic/data/xonotic-maps.pk3dir
  61. + git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic-maps.pk3dir.git
  62. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  63. + git pull
  64. A .gitignore
  65. A models/lights/xonlight01.md3
  66. A models/lights/xonlight02.md3
  67. A models/lights/xonlight03.md3
  68. A models/lights/xonlight04.md3
  69. A models/lights/xonlight05.md3
  70. A models/lights/xonlight06.md3
  71. A models/lights/xonlight07.md3
  72. A models/lights/xonlightpost01.md3
  73. A models/lights/xonlightpost02.md3
  74. A models/lights/xonlightpost03.md3
  75. A models/lights/xonlightpost04.md3
  76. A models/lights/xonlightpost05.md3
  77. U scripts/common.shader
  78. A scripts/decals.shader
  79. U scripts/entities.def
  80. U scripts/exx.shader
  81. A textures/common/hintskip.tga
  82. A textures/decals/scorch01.tga
  83. A textures/decals/scorch01_norm.tga
  84. A textures/decals/scorch02.tga
  85. A textures/decals/splatter01.tga
  86. A textures/decals/splatter02.tga
  87. A textures/decals/splatter03.tga
  88. A textures/decals/splatter04.tga
  89. A textures/decals/splatter05.tga
  90. U textures/exx/base/base_metal01_gloss.tga
  91. U textures/exx/base/base_metal02_gloss.tga
  92. U textures/exx/base/base_metal03_gloss.tga
  93. U textures/exx/base/base_metal04_gloss.tga
  94. U textures/exx/base/base_metal05rust_gloss.tga
  95. U textures/exx/base/base_metal06rust_gloss.tga
  96. U textures/exx/base/base_metal07rust_gloss.tga
  97. U textures/exx/floor/floor_clang01_gloss.tga
  98. A textures/exx/floor/floor_clang01b_gloss.tga
  99. U textures/exx/floor/floor_grate01_gloss.tga
  100. U textures/exx/floor/floor_grate02.tga
  101. U textures/exx/floor/floor_grate02_gloss.tga
  102. U textures/exx/floor/floor_grate03.tga
  103. U textures/exx/floor/floor_grate03_gloss.tga
  104. U textures/exx/floor/floor_grate04.tga
  105. U textures/exx/floor/floor_grate04_gloss.tga
  106. U textures/exx/floor/floor_metal02_gloss.tga
  107. U textures/exx/floor/floor_panel01_gloss.tga
  108. U textures/exx/floor/floor_rnd01_gloss.tga
  109. U textures/exx/floor/floor_rnd02_gloss.tga
  110. U textures/exx/floor/floor_simple05_gloss.tga
  111. U textures/exx/floor/floor_simplines_gloss.tga
  112. U textures/exx/floor/floor_tile03_gloss.tga
  113. U textures/exx/floor/floor_tread01_gloss.tga
  114. U textures/exx/light/light_panel01_gloss.tga
  115. U textures/exx/light/light_u201_gloss.tga
  116. U textures/exx/panel/panel_metal01_gloss.tga
  117. U textures/exx/panel/panel_metal01c_gloss.tga
  118. U textures/exx/panel/panel_metal02_gloss.tga
  119. U textures/exx/panel/panel_metal03_gloss.tga
  120. U textures/exx/panel/panel_metal04_gloss.tga
  121. U textures/exx/panel/panel_metal05_gloss.tga
  122. U textures/exx/panel/panel_metalbig04_gloss.tga
  123. U textures/exx/panel/panel_metalbig04b_gloss.tga
  124. U textures/exx/panel/panel_q201_gloss.tga
  125. U textures/exx/panel/panel_q201b_gloss.tga
  126. U textures/exx/panel/panel_q201c_gloss.tga
  127. U textures/exx/panel/panel_q201d_gloss.tga
  128. U textures/exx/panel/panel_q201e_gloss.tga
  129. U textures/exx/panel/panel_rs01_gloss.tga
  130. U textures/exx/trim/trim_01_gloss.tga
  131. U textures/exx/trim/trim_baseboard02_gloss.tga
  132. U textures/exx/trim/trim_baseboard03_gloss.tga
  133. U textures/exx/trim/trim_baseboard_gloss.tga
  134. A textures/exx/trim/trim_horz01.tga
  135. A textures/exx/trim/trim_horz01_gloss.tga
  136. A textures/exx/trim/trim_horz01_norm.tga
  137. U textures/exx/trim/trim_metalsupp01_gloss.tga
  138. U textures/exx/trim/trim_psimple04_gloss.tga
  139. U textures/exx/trim/trim_psimple05_gloss.tga
  140. U textures/exx/trim/trim_simple01_gloss.tga
  141. U textures/exx/trim/trim_simple03_gloss.tga
  142. U textures/exx/trim/trim_steptop01_gloss.tga
  143. U textures/exx/trim/trim_support03_gloss.tga
  144. U textures/exx/trim/trim_vert01_gloss.tga
  145. A textures/exx/trim/trim_vert01_norm.tga
  146. A textures/exx/trim/trim_vert_01_norm.tga
  147. U textures/exx/wall/wall_bigrib02_gloss.tga
  148. U textures/exx/wall/wall_bplate06_gloss.tga
  149. U textures/exx/wall/wall_des01_gloss.tga
  150. U textures/exx/wall/wall_metal01_gloss.tga
  151. U textures/exx/wall/wall_metal01b_gloss.tga
  152. U textures/exx/wall/wall_metalb01_gloss.tga
  153. U textures/exx/wall/wall_metalrib01_gloss.tga
  154. U textures/exx/wall/wall_panel05_gloss.tga
  155. U textures/exx/wall/wall_panels08_gloss.tga
  156. U textures/exx/wall/wall_panels08b_gloss.tga
  157. U textures/exx/wall/wall_pipe_gloss.tga
  158. U textures/exx/wall/wall_u207_gloss.tga
  159. U textures/facility114x/base/baseblue_gloss.tga
  160. U textures/facility114x/base/basered_gloss.tga
  161. U textures/facility114x/base/baseyellow_gloss.tga
  162. U textures/facility114x/ceiling/ceiling00_gloss.tga
  163. U textures/facility114x/ceiling/ceiling01_gloss.tga
  164. U textures/facility114x/misc/door01_gloss.tga
  165. U textures/facility114x/misc/lift00_gloss.tga
  166. U textures/facility114x/misc/lift01_gloss.tga
  167. U textures/facility114x/misc/lift02_gloss.tga
  168. U textures/facility114x/trim/trim01_gloss.tga
  169. U textures/facility114x/wall/corridor00_gloss.tga
  170. U textures/facility114x/wall/corridor01_gloss.tga
  171. U textures/facility114x/wall/corridor02_gloss.tga
  172. U textures/trak4x/base/base_paint_blue_gloss.tga
  173. U textures/trak4x/base/base_paint_dblue_gloss.tga
  174. U textures/trak4x/base/base_paint_green_gloss.tga
  175. U textures/trak4x/base/base_paint_pink_gloss.tga
  176. U textures/trak4x/base/base_paint_purp_gloss.tga
  177. U textures/trak4x/base/base_paint_red_gloss.tga
  178. U textures/trak4x/base/base_paint_yellow_gloss.tga
  179. U textures/trak4x/base/base_rust1c_gloss.tga
  180. U textures/trak4x/base/base_rust2_gloss.tga
  181. U textures/trak4x/base/base_rust2b_gloss.tga
  182. U textures/trak4x/floor/floor_tile1_gloss.tga
  183. U textures/trak4x/floor/floor_tile2a_gloss.tga
  184. U textures/trak4x/floor/floor_tile2b_gloss.tga
  185. U textures/trak4x/floor/floor_tile3a_gloss.tga
  186. U textures/trak4x/floor/floor_tile3b_gloss.tga
  187. U textures/trak4x/floor/floor_tile3c_gloss.tga
  188. U textures/trak4x/trim/trim_grate1_gloss.tga
  189. U textures/trak4x/trim/trim_grate2a_gloss.tga
  190. U textures/trak5x/base/base_pipe1a_gloss.tga
  191. U textures/trak5x/base/base_pipe1b_gloss.tga
  192. U textures/trak5x/base/base_pipe1c_gloss.tga
  193. U textures/trak5x/base/base_pipe1d_gloss.tga
  194. U textures/trak5x/floor/floor_tile1a_gloss.tga
  195. U textures/trak5x/floor/floor_tile1b_gloss.tga
  196. U textures/trak5x/floor/floor_tile1c_gloss.tga
  197. U textures/trak5x/floor/floor_tile1d_gloss.tga
  198. U textures/trak5x/floor/floor_tile2a_gloss.tga
  199. U textures/trak5x/floor/floor_tile2b_gloss.tga
  200. U textures/trak5x/floor/floor_tile2c_gloss.tga
  201. U textures/trak5x/floor/floor_tile2d_gloss.tga
  202. U textures/trak5x/floor/floor_tile3a_gloss.tga
  203. U textures/trak5x/floor/floor_tile3b_gloss.tga
  204. U textures/trak5x/floor/floor_tile3c_gloss.tga
  205. U textures/trak5x/floor/floor_tile3d_gloss.tga
  206. U textures/trak5x/light/light_light1a_gloss.tga
  207. U textures/trak5x/misc/misc_thingy1a_gloss.tga
  208. U textures/trak5x/panel/panel_comp1a_gloss.tga
  209. U textures/trak5x/panel/panel_comp1b_gloss.tga
  210. U textures/trak5x/panel/panel_comp1c_gloss.tga
  211. U textures/trak5x/panel/panel_comp1d_gloss.tga
  212. U textures/trak5x/panel/panel_comp1e_gloss.tga
  213. U textures/trak5x/panel/panel_crate1a_gloss.tga
  214. U textures/trak5x/panel/panel_crate1b_gloss.tga
  215. U textures/trak5x/panel/panel_crate1c_gloss.tga
  216. U textures/trak5x/panel/panel_crate1d_gloss.tga
  217. U textures/trak5x/panel/panel_grate1a_gloss.tga
  218. U textures/trak5x/panel/panel_grate2a_gloss.tga
  219. U textures/trak5x/panel/panel_graypanel1_gloss.tga
  220. U textures/trak5x/panel/panel_graypanel2_gloss.tga
  221. U textures/trak5x/panel/panel_graypanel3_gloss.tga
  222. U textures/trak5x/panel/panel_panel1a_gloss.tga
  223. U textures/trak5x/panel/panel_trisec1c_gloss.tga
  224. U textures/trak5x/panel/panel_trisec1d_gloss.tga
  225. U textures/trak5x/panel/panel_vertpanel1a_gloss.tga
  226. U textures/trak5x/panel/panel_vertpanel1b_gloss.tga
  227. U textures/trak5x/panel/panel_vertpanel1c_gloss.tga
  228. U textures/trak5x/panel/panel_vertpanel1d_gloss.tga
  229. U textures/trak5x/panel/panel_vertpanel1e_gloss.tga
  230. U textures/trak5x/panel/panel_vertpanel2a_gloss.tga
  231. U textures/trak5x/panel/panel_vertpanel2b_gloss.tga
  232. U textures/trak5x/panel/panel_vertpanel2c_gloss.tga
  233. U textures/trak5x/panel/panel_vertpanel2d_gloss.tga
  234. U textures/trak5x/panel/panel_vertpanel2e_gloss.tga
  235. U textures/trak5x/trim/trim_trim3a_gloss.tga
  236. U textures/trak5x/trim/trim_trim3b_gloss.tga
  237. U textures/trak5x/trim/trim_trim3c_gloss.tga
  238. U textures/trak5x/trim/trim_trim3d_gloss.tga
  239. U textures/trak5x/trim/trim_trim4a_gloss.tga
  240. U textures/trak5x/trim/trim_trim4b_gloss.tga
  241. U textures/trak5x/trim/trim_trim4c_gloss.tga
  242. U textures/trak5x/trim/trim_trim4d_gloss.tga
  243. U textures/trak5x/trim/trim_trim5a_gloss.tga
  244. U textures/trak5x/trim/trim_trim5b_gloss.tga
  245. U textures/trak5x/trim/trim_trim5c_gloss.tga
  246. U textures/trak5x/trim/trim_trim5d_gloss.tga
  247. U textures/trak5x/trim/trim_trim6a_gloss.tga
  248. U textures/trak5x/trim/trim_trim6b_gloss.tga
  249. U textures/trak5x/trim/trim_trim7a_gloss.tga
  250. U textures/trak5x/trim/trim_trim7b_gloss.tga
  251. U textures/trak5x/trim/trim_trim7c_gloss.tga
  252. U textures/trak5x/trim/trim_trim7d_gloss.tga
  253. U textures/trak5x/trim/trim_trim7e_gloss.tga
  254. U textures/trak5x/trim/trim_trim8a_gloss.tga
  255. U textures/trak5x/wall/wall_wall1a_gloss.tga
  256. U textures/trak5x/wall/wall_wall1b_gloss.tga
  257. U textures/trak5x/wall/wall_wall1c_gloss.tga
  258. U textures/trak5x/wall/wall_wall1d_gloss.tga
  259. U textures/trak5x/wall/wall_wall2a_gloss.tga
  260. U textures/trak5x/wall/wall_wall2b_gloss.tga
  261. U textures/trak5x/wall/wall_wall2c_gloss.tga
  262. U textures/trak5x/wall/wall_wall2d_gloss.tga
  263. U textures/trak5x/wall/wall_wall3a_gloss.tga
  264. U textures/trak5x/wall/wall_wall3b_gloss.tga
  265. U textures/trak5x/wall/wall_wall3c_gloss.tga
  266. U textures/trak5x/wall/wall_wall3d_gloss.tga
  267. U textures/trak5x/wall/wall_wall4a_gloss.tga
  268. U textures/trak5x/wall/wall_wall4b_gloss.tga
  269. U textures/trak5x/wall/wall_wall4c_gloss.tga
  270. U textures/trak5x/wall/wall_wall4e_gloss.tga
  271. U textures/trak5x/wall/wall_wall5a_gloss.tga
  272. U textures/trak5x/wall/wall_wall5b_gloss.tga
  273. U textures/trak5x/wall/wall_wall5c_gloss.tga
  274. U textures/trak5x/wall/wall_wall5d_gloss.tga
  275. U textures/trak5x/wall/wall_wall5e_gloss.tga
  276. U textures/trak5x/wall/wall_wall6a_gloss.tga
  277. U textures/trak5x/wall/wall_wall7a_gloss.tga
  278. Pull is not possible because you have unmerged files.
  279. Please, fix them up in the work tree, and then use 'git add/rm <file>'
  280. as appropriate to mark resolution, or use 'git commit -a'.
  281. Pulling failed. Press ENTER to continue, or Ctrl-C to abort.
  282.  
  283. + git remote prune origin
  284. Pruning origin
  285. URL: ssh://xonotic@git.xonotic.org/xonotic-maps.pk3dir.git
  286. * [pruned] origin/fruitiex/newhudsetup
  287. * [pruned] origin/fruitiex/newpanelhud
  288. + cd /home/akion/Gamez/Xonotic/xonotic/data/xonotic-music.pk3dir
  289. + git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic-music.pk3dir.git
  290. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  291. + git pull
  292. Already up-to-date.
  293. + git remote prune origin
  294. + cd /home/akion/Gamez/Xonotic/xonotic/data/xonotic-nexcompat.pk3dir
  295. + git config remote.origin.url ssh://xonotic@git.xonotic.org/xonotic-nexcompat.pk3dir.git
  296. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  297. + git pull
  298. Already up-to-date.
  299. + git remote prune origin
  300. + cd /home/akion/Gamez/Xonotic/xonotic/mediasource
  301. + git config remote.origin.url ssh://xonotic@git.xonotic.org/mediasource.git
  302. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  303. + git pull
  304. remote: Counting objects: 25, done.
  305. remote: Compressing objects: 100% (16/16), done.
  306. remote: Total 16 (delta 9), reused 0 (delta 0)
  307. Unpacking objects: 100% (16/16), done.
  308. From ssh://git.xonotic.org/mediasource
  309. 5790b9e..b531186 master -> origin/master
  310. * [new branch] plasmasheep/simpleicons -> origin/plasmasheep/simpleicons
  311. Updating 5790b9e..b531186
  312. Fast-forward
  313. models/weapons/g_weapons/g_nex.blend | Bin 0 -> 492104 bytes
  314. models/weapons/h_weapons/blend/h_nex.blend | Bin 413208 -> 413864 bytes
  315. models/weapons/v_weapons/v_nex.blend | Bin 325460 -> 465492 bytes
  316. 3 files changed, 0 insertions(+), 0 deletions(-)
  317. create mode 100644 models/weapons/g_weapons/g_nex.blend
  318. + git remote prune origin
  319. Pruning origin
  320. URL: ssh://xonotic@git.xonotic.org/mediasource.git
  321. * [pruned] origin/diabolik/nexmodel
  322. * [pruned] origin/diabolik/weaponscalesource
  323. * [pruned] origin/fruitiex/wickedhud
  324. * [pruned] origin/mand1nga/rebrand
  325. + cd /home/akion/Gamez/Xonotic/xonotic/darkplaces
  326. + git config remote.origin.url ssh://xonotic@git.xonotic.org/darkplaces.git
  327. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  328. + git pull
  329. remote: Counting objects: 101, done.
  330. remote: Compressing objects: 100% (62/62), done.
  331. remote: Total 62 (delta 53), reused 0 (delta 0)
  332. Unpacking objects: 100% (62/62), done.
  333. From ssh://git.xonotic.org/darkplaces
  334. 8170bc8..b337fa3 div0-stable -> origin/div0-stable
  335. 08fe8ce..0a3dbf7 master -> origin/master
  336. 80d318e..839df22 mirceakitsune/roll_bobbing -> origin/mirceakitsune/roll_bobbing
  337. * [new branch] parasti/for-stable/clamp-cubemap -> origin/parasti/for-stable/clamp-cubemap
  338. Updating 08fe8ce..0a3dbf7
  339. Fast-forward
  340. .cvsignore => .gitignore | 3 +
  341. cl_gecko.c | 2 +-
  342. cl_input.c | 2 +-
  343. cl_particles.c | 2 +-
  344. cl_screen.c | 2 +-
  345. cl_video.c | 2 +-
  346. clvm_cmds.c | 2 +-
  347. console.c | 66 ++++++++++++++++++------
  348. ft2.c | 4 +-
  349. gl_draw.c | 22 ++++----
  350. gl_rmain.c | 123 +++++++++++++++++++++++++--------------------
  351. gl_textures.c | 107 ++++++++++++++++++++++++++-------------
  352. host.c | 2 +
  353. image.c | 48 ++++++++++--------
  354. image.h | 4 +-
  355. image_png.c | 2 +-
  356. image_png.h | 2 +-
  357. jpeg.c | 18 +++++--
  358. jpeg.h | 2 +-
  359. model_brush.c | 20 ++++----
  360. model_shared.c | 4 +-
  361. r_explosion.c | 2 +-
  362. r_shadow.c | 14 +++---
  363. r_sky.c | 8 ++--
  364. r_textures.h | 13 +++--
  365. 25 files changed, 291 insertions(+), 185 deletions(-)
  366. rename .cvsignore => .gitignore (89%)
  367. + git remote prune origin
  368. Pruning origin
  369. URL: ssh://xonotic@git.xonotic.org/darkplaces.git
  370. * [pruned] origin/divVerent/jpegpicmip
  371. * [pruned] origin/fruitiex/newpanelhud
  372. * [pruned] origin/parasti/clamp-cubemap
  373. + cd /home/akion/Gamez/Xonotic/xonotic/fteqcc
  374. + git config remote.origin.url git://github.com/Blub/qclib.git
  375. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  376. + git pull
  377. Already up-to-date.
  378. + git remote prune origin
  379. + cd /home/akion/Gamez/Xonotic/xonotic/div0-gittools
  380. + git config remote.origin.url git://git.icculus.org/divverent/div0-gittools.git
  381. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  382. + git pull
  383. Already up-to-date.
  384. + git remote prune origin
  385. + cd /home/akion/Gamez/Xonotic/xonotic/netradiant
  386. + git config remote.origin.url ssh://xonotic@git.xonotic.org/netradiant.git
  387. + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
  388. + git pull
  389. remote: Counting objects: 35, done.
  390. remote: Compressing objects: 100% (25/25), done.
  391. remote: Total 25 (delta 16), reused 0 (delta 0)
  392. Unpacking objects: 100% (25/25), done.
  393. From ssh://git.xonotic.org/netradiant
  394. 0c20b6e..64144b4 master -> origin/master
  395. Updating 0c20b6e..64144b4
  396. Fast-forward
  397. plugins/vfspk3/vfs.cpp | 6 +++---
  398. tools/quake3/common/vfs.c | 4 ++--
  399. tools/quake3/q3map2/light_ydnar.c | 22 ++++++++++++++++++++--
  400. 3 files changed, 25 insertions(+), 7 deletions(-)
  401. + git remote prune origin
  402. akion@quadra:~/Gamez/Xonotic/xonotic$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!