API tools faq
paste
Advertisement
Guest User

Untitled

a guest
May 10th, 2016
85
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 48.14 KB | None | 0 0
raw download clone embed print report
  1. commit 05fbea0e20de38426541efdffd4e3d9ccaf4ec04
  2. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  3. Date: Wed May 11 00:04:14 2016 -0400
  4.  
  5. More last minute changes
  6.  
  7. commit a610d8b978bc0d4d7e7a9e39936941d047d36738
  8. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  9. Date: Tue May 10 23:48:08 2016 -0400
  10.  
  11. More last minute changes
  12.  
  13. commit 69b3e454a7e5823d76edce7874b31ee43cc1ed9c
  14. Merge: bd02283 5a59f8d
  15. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  16. Date: Tue May 10 23:40:36 2016 -0400
  17.  
  18. Merge remote-tracking branch 'origin/master'
  19.  
  20. commit bd02283469d1023691023493b76c8a54ea4269e4
  21. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  22. Date: Tue May 10 23:40:22 2016 -0400
  23.  
  24. Added check button functionality improvement
  25.  
  26. commit 5a59f8dd0b0a28a3690e265abea9a515935820b7
  27. Author: tws3466 <tws3466@cs.rit.edu>
  28. Date: Tue May 10 23:27:27 2016 -0400
  29.  
  30. tweaked a few more comments
  31.  
  32. commit 7321f2c3587c3f48dbd2f4e42a9f4f69e263b877
  33. Author: kec9020 <kec9020@cs.rit.edu>
  34. Date: Tue May 10 23:02:21 2016 -0400
  35.  
  36. worked on hint
  37.  
  38. commit d6140be5643560928d533d4dd3a65e48a685f7b4
  39. Merge: aa67745 b047a1e
  40. Author: kec9020 <kec9020@cs.rit.edu>
  41. Date: Tue May 10 22:32:41 2016 -0400
  42.  
  43. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  44.  
  45. commit aa6774598f38ac996852a9a9186fa0d258476878
  46. Author: kec9020 <kec9020@cs.rit.edu>
  47. Date: Tue May 10 22:32:10 2016 -0400
  48.  
  49. worked on hint
  50.  
  51. commit b047a1e38331335a2a0c9344f3b9a9ede198fe1a
  52. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  53. Date: Tue May 10 22:14:14 2016 -0400
  54.  
  55. Added check button functionality improvement
  56.  
  57. commit 5f748b84ffda0c1e3fb1430c016425c805373855
  58. Merge: 5545f85 8450865
  59. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  60. Date: Tue May 10 22:11:47 2016 -0400
  61.  
  62. Merge remote-tracking branch 'origin/master'
  63.  
  64. commit 5545f85658efa24662fde0bbe6be9a43c4a22684
  65. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  66. Date: Tue May 10 22:11:23 2016 -0400
  67.  
  68. Added check button functionality improvement
  69.  
  70. commit 8450865adac8e49b136ac9c1f5d3e6eec9d36c2b
  71. Merge: f345add 25914f3
  72. Author: kec9020 <kec9020@cs.rit.edu>
  73. Date: Tue May 10 22:04:25 2016 -0400
  74.  
  75. worked on hint
  76.  
  77. commit f345add5c867bf59a9bee370563fabbf78007f96
  78. Author: kec9020 <kec9020@cs.rit.edu>
  79. Date: Tue May 10 21:57:56 2016 -0400
  80.  
  81. worked on hint
  82.  
  83. commit 25914f30a32c0c3728000599afc4282bd7c8a87b
  84. Merge: 8d016b8 e48fecf
  85. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  86. Date: Tue May 10 21:55:10 2016 -0400
  87.  
  88. Merge remote-tracking branch 'origin/master'
  89.  
  90. commit 8d016b8e617d40a908cfff9bfe6904d74b46ea8d
  91. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  92. Date: Tue May 10 21:54:53 2016 -0400
  93.  
  94. Added check button functionality
  95.  
  96. commit e48fecf2ab531758d53fa8b13842c95556cf54a8
  97. Author: tws3466 <tws3466@cs.rit.edu>
  98. Date: Tue May 10 20:44:03 2016 -0400
  99.  
  100. some minor formatting changes
  101.  
  102. commit def70fdad772fbbea0144b2b1904baf6d4528cc7
  103. Author: tws3466 <tws3466@cs.rit.edu>
  104. Date: Tue May 10 20:43:37 2016 -0400
  105.  
  106. some minor formatting changes
  107.  
  108. commit 1506676dc37c59568c6f43f7d54b68c3403450d0
  109. Author: tws3466 <tws3466@cs.rit.edu>
  110. Date: Tue May 10 20:27:43 2016 -0400
  111.  
  112. added comments for anonymous classes
  113.  
  114. commit 1d273f1116f2c02639a6a3cc189b2cd30763c599
  115. Author: tws3466 <tws3466@cs.rit.edu>
  116. Date: Tue May 10 20:08:12 2016 -0400
  117.  
  118. removed buttonDemo and ilk, added some future comment places, and removed some done todos
  119.  
  120. commit a3b444fd4666cc9765f78f004b41539ca4cde8c5
  121. Merge: e014f95 9fc90a2
  122. Author: kec9020 <kec9020@cs.rit.edu>
  123. Date: Tue May 10 20:02:48 2016 -0400
  124.  
  125. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  126.  
  127. commit e014f95818118d2061ec4e6a60c5046df758df8b
  128. Author: kec9020 <kec9020@cs.rit.edu>
  129. Date: Tue May 10 20:02:25 2016 -0400
  130.  
  131. ok
  132.  
  133. commit 9cabefe70e2c79a9179bf134ef971567a310b5e7
  134. Merge: d4d94b0 9fc90a2
  135. Author: tws3466 <tws3466@cs.rit.edu>
  136. Date: Tue May 10 19:57:42 2016 -0400
  137.  
  138. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  139.  
  140. commit d4d94b02172afa2408e7610e0f8a27e494510125
  141. Author: tws3466 <tws3466@cs.rit.edu>
  142. Date: Tue May 10 19:57:19 2016 -0400
  143.  
  144. made LasersPTUI less scavenged looking
  145.  
  146. commit 22362d08df23f4da7d80f9b9841e801cfddfed27
  147. Merge: d507997 87822ee
  148. Author: kec9020 <kec9020@cs.rit.edu>
  149. Date: Tue May 10 19:54:01 2016 -0400
  150.  
  151. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  152.  
  153. commit 9fc90a2bc213f8711be2c7e27c277e8153b038b5
  154. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  155. Date: Tue May 10 19:53:53 2016 -0400
  156.  
  157. GUI related fixes more
  158.  
  159. commit 87822eee39cbdcfea3d2c9b1e4b8508710280398
  160. Merge: 88ea159 a1728f7
  161. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  162. Date: Tue May 10 19:52:53 2016 -0400
  163.  
  164. Merge remote-tracking branch 'origin/master'
  165.  
  166. commit 88ea159532c1aa5be1d3d69c99bc708106365495
  167. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  168. Date: Tue May 10 19:52:40 2016 -0400
  169.  
  170. GUI related fixes
  171.  
  172. commit a1728f781b25a3526e3f60831355cc4063e2ab24
  173. Merge: be138de 3b9449e
  174. Author: tws3466 <tws3466@cs.rit.edu>
  175. Date: Tue May 10 19:44:27 2016 -0400
  176.  
  177. Merge remote-tracking branch 'origin/master'
  178.  
  179. commit d507997a589eff9a3a06787fafd4f7b8d40329ae
  180. Merge: f1da062 3b9449e
  181. Author: kec9020 <kec9020@cs.rit.edu>
  182. Date: Tue May 10 19:44:07 2016 -0400
  183.  
  184. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  185.  
  186. commit 3b9449e9e1758f56feae67d8db0db5cfb331a574
  187. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  188. Date: Tue May 10 19:43:22 2016 -0400
  189.  
  190. Added load button functionality with file chooser
  191.  
  192. commit be138de7f42ee18570a90a3e3b432378e88b1b27
  193. Author: tws3466 <tws3466@cs.rit.edu>
  194. Date: Tue May 10 19:41:56 2016 -0400
  195.  
  196. fixed some spelling
  197.  
  198. commit ee6c6c696eb9501cb4755eeb86daa5e90362aa7c
  199. Merge: ba957a6 1e7431a
  200. Author: tws3466 <tws3466@cs.rit.edu>
  201. Date: Tue May 10 19:33:42 2016 -0400
  202.  
  203. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  204.  
  205. commit ba957a6fae8f858f0a68ec5ecdf2ba4a194d9534
  206. Author: tws3466 <tws3466@cs.rit.edu>
  207. Date: Tue May 10 19:33:20 2016 -0400
  208.  
  209. Added additional comments and formatting
  210.  
  211. commit 5b2154655918ab5979f3bc988b31e9798c686d8e
  212. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  213. Date: Tue May 10 19:29:15 2016 -0400
  214.  
  215. Fix for label update issue
  216.  
  217. commit f1da0624c70c4a6e0d75002fdf14bdfd683d17f4
  218. Merge: bb0dcbe 1e7431a
  219. Author: kec9020 <kec9020@cs.rit.edu>
  220. Date: Tue May 10 19:27:15 2016 -0400
  221.  
  222. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  223.  
  224. commit bb0dcbe58af49a8ae4d4572a5eaa15f1c907b9db
  225. Author: kec9020 <kec9020@cs.rit.edu>
  226. Date: Tue May 10 19:26:53 2016 -0400
  227.  
  228. ok
  229.  
  230. commit 1e7431aabe50b951b7015bfcbcae27ba9f73a0e8
  231. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  232. Date: Tue May 10 19:26:16 2016 -0400
  233.  
  234. Fix for label update issue
  235.  
  236. commit d50aae2b1705ebbe6d4e6f495ea7ec65d643b850
  237. Merge: 88db11d 3a1d2bc
  238. Author: tws3466 <tws3466@cs.rit.edu>
  239. Date: Tue May 10 19:11:09 2016 -0400
  240.  
  241. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  242.  
  243. # Conflicts:
  244. # src/gui/LasersGUI.java
  245. # src/model/LasersModel.java
  246.  
  247. Merging latest comments and formatting edits in
  248.  
  249. commit 88db11d1918c9896ee76b7d1fe4ded4253a66f78
  250. Author: tws3466 <tws3466@cs.rit.edu>
  251. Date: Tue May 10 19:03:12 2016 -0400
  252.  
  253. Looooads of new comments, Especially for LasersModel and LasersGUI. Fixed a few spelling errors and some formatting as well.
  254.  
  255. commit 3a1d2bc52027f6e746c6e923e83843d0c8f0c9bb
  256. Merge: 3efd039 b6d8898
  257. Author: kec9020 <kec9020@cs.rit.edu>
  258. Date: Tue May 10 18:54:15 2016 -0400
  259.  
  260. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  261.  
  262. commit 3efd039fcb28441f3847be37783bde2920c3aa49
  263. Author: kec9020 <kec9020@cs.rit.edu>
  264. Date: Tue May 10 18:53:58 2016 -0400
  265.  
  266. adding and removing lasers to the GUI works!
  267.  
  268. commit db2e279c3e37d7d85dd0784499759d06d5e51807
  269. Author: kec9020 <kec9020@cs.rit.edu>
  270. Date: Tue May 10 18:53:21 2016 -0400
  271.  
  272. adding and removing lasers to the GUI works!
  273.  
  274. commit b6d8898565fc284f27680c5b9790f95847a7ac38
  275. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  276. Date: Tue May 10 18:51:02 2016 -0400
  277.  
  278. Fixing a little bit of hints
  279.  
  280. commit 88271ece916601f789edfd35062e9c60dde42434
  281. Merge: 1c11ff4 c8bd9a0
  282. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  283. Date: Tue May 10 18:23:24 2016 -0400
  284.  
  285. Merge remote-tracking branch 'origin/master'
  286.  
  287. commit 1c11ff487719bc94c9180f913b7f9562c540acbb
  288. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  289. Date: Tue May 10 18:23:10 2016 -0400
  290.  
  291. Made hint work
  292.  
  293. commit c8bd9a0eb8d2d8ab8a6fccef0192b6c16be6d5f4
  294. Author: kec9020 <kec9020@cs.rit.edu>
  295. Date: Tue May 10 18:00:48 2016 -0400
  296.  
  297. adding and removing lasers to the GUI works!
  298.  
  299. commit ef9b40a9b10eb5846b716f893e9c9465ffa61bbd
  300. Merge: 437abd6 a7508ad
  301. Author: kec9020 <kec9020@cs.rit.edu>
  302. Date: Tue May 10 17:08:03 2016 -0400
  303.  
  304. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  305.  
  306. commit 437abd6f64e7355e79be9f1463091b1293ede73d
  307. Author: kec9020 <kec9020@cs.rit.edu>
  308. Date: Tue May 10 17:07:46 2016 -0400
  309.  
  310. yup
  311.  
  312. commit a7508ad550b405afe458ff7aa176e48a4655b0b9
  313. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  314. Date: Tue May 10 17:04:37 2016 -0400
  315.  
  316. !!Working Ghost Laser beam fix
  317.  
  318. commit 28bddb96d9eab1556c2b5bce5c398c5673852fbf
  319. Author: kec9020 <kec9020@cs.rit.edu>
  320. Date: Tue May 10 16:45:51 2016 -0400
  321.  
  322. centered the message, but it still has problems. Still need to to the load and hint buttons, and how to add and remove the Lasers
  323.  
  324. commit 1fa520da0eb01c4edada6df960e64d72ec097504
  325. Merge: 7812a67 45f19cb
  326. Author: tws3466 <tws3466@cs.rit.edu>
  327. Date: Tue May 10 16:40:29 2016 -0400
  328.  
  329. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  330.  
  331. commit 7812a67735f5bd7f31449929c75b4cc5f7b0e00e
  332. Author: tws3466 <tws3466@cs.rit.edu>
  333. Date: Tue May 10 16:40:08 2016 -0400
  334.  
  335. merging in comments
  336.  
  337. commit da37620598c4f8ee658fa9f7a86de989be5ad671
  338. Merge: d2072b5 45f19cb
  339. Author: kec9020 <kec9020@cs.rit.edu>
  340. Date: Tue May 10 16:40:06 2016 -0400
  341.  
  342. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  343.  
  344. commit d2072b5e5d8b598738bc66da67e594efe5711125
  345. Author: kec9020 <kec9020@cs.rit.edu>
  346. Date: Tue May 10 16:39:51 2016 -0400
  347.  
  348. Added the message at the top, still need to center it
  349.  
  350. commit 20e0210c7bef5b135392889b68daac290a4756d3
  351. Merge: 1f07ed4 1d390aa
  352. Author: tws3466 <tws3466@cs.rit.edu>
  353. Date: Tue May 10 16:39:13 2016 -0400
  354.  
  355. merging in comments
  356.  
  357. commit 45f19cbb281fe80ce1768330df221044638ab458
  358. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  359. Date: Tue May 10 16:38:33 2016 -0400
  360.  
  361. Ghost Laser beam fix
  362.  
  363. commit 1f07ed4f292f8300e61b7495511b94787e94226c
  364. Author: tws3466 <tws3466@cs.rit.edu>
  365. Date: Tue May 10 16:26:56 2016 -0400
  366.  
  367. comments and warning fixes
  368.  
  369. commit 1d390aafdfcaf8b1043d60fe024f9880c5ade471
  370. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  371. Date: Tue May 10 16:04:54 2016 -0400
  372.  
  373. Added solve button functionality to the GUI
  374.  
  375. commit 07c8ad6eca1500fb0593ee08fa599a05bab0b040
  376. Merge: 343bac1 a88ee88
  377. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  378. Date: Tue May 10 15:54:04 2016 -0400
  379.  
  380. Merge remote-tracking branch 'origin/master'
  381.  
  382. commit 343bac1f0243dc2c8ccf9e26685b9501dfb052fb
  383. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  384. Date: Tue May 10 15:53:51 2016 -0400
  385.  
  386. More Code optimisations
  387.  
  388. commit a88ee88a80231ca366b514d6580cc0ef201604eb
  389. Author: kec9020 <kec9020@cs.rit.edu>
  390. Date: Tue May 10 15:53:20 2016 -0400
  391.  
  392. worked on the GUI update and reset and solve
  393.  
  394. commit e80beda55800505faf867d16413d72c34d8907e1
  395. Author: kec9020 <kec9020@cs.rit.edu>
  396. Date: Tue May 10 15:42:14 2016 -0400
  397.  
  398. worked on the GUI update and reset and solve
  399.  
  400. commit 5c99823aef883e7469f61fdce633bdddccbcca0e
  401. Author: kec9020 <kec9020@cs.rit.edu>
  402. Date: Tue May 10 15:29:04 2016 -0400
  403.  
  404. worked on the GUI update and reset
  405.  
  406. commit 51cc0e13f5db85e503e300b9470dfbaec45c185f
  407. Author: kec9020 <kec9020@cs.rit.edu>
  408. Date: Tue May 10 14:14:17 2016 -0400
  409.  
  410. The GUI is automattically putting the pillars into the graph
  411.  
  412. commit 3bfab46510ce8f548e54fe06c3493a2f54eccb7d
  413. Merge: 29ca0d3 d012933
  414. Author: kec9020 <kec9020@cs.rit.edu>
  415. Date: Tue May 10 08:12:30 2016 -0400
  416.  
  417. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  418.  
  419. commit d01293358ff88dfd4503064ff4c8087b0f3e27db
  420. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  421. Date: Mon May 9 23:34:36 2016 -0400
  422.  
  423. 4x4 error fix
  424.  
  425. commit 29ca0d37b250be2eb1136398dc15d389bb1866b2
  426. Merge: 7cf0465 2e0166a
  427. Author: kec9020 <kec9020@cs.rit.edu>
  428. Date: Mon May 9 23:27:39 2016 -0400
  429.  
  430. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  431.  
  432. commit 2e0166abcd991f988df2b0a8536cc37f1031075d
  433. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  434. Date: Mon May 9 23:24:59 2016 -0400
  435.  
  436. possible optimisation
  437.  
  438. commit 7cf0465a0c6bf6bda29717c3f84759fcf6972071
  439. Merge: 7fe2f37 13b4c00
  440. Author: kec9020 <kec9020@cs.rit.edu>
  441. Date: Mon May 9 23:22:02 2016 -0400
  442.  
  443. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  444.  
  445. # Conflicts:
  446. # src/backtracking/SafeConfig.java
  447. # testtest.txt
  448.  
  449. commit 7fe2f37344141542024cf9f9a03c340502454a86
  450. Author: kec9020 <kec9020@cs.rit.edu>
  451. Date: Mon May 9 23:18:09 2016 -0400
  452.  
  453. yup
  454.  
  455. commit 5ec955e8e914bb87803c5faea45900ae675ff2f0
  456. Author: kec9020 <kec9020@cs.rit.edu>
  457. Date: Mon May 9 23:14:31 2016 -0400
  458.  
  459. yup
  460.  
  461. commit 58741c4165b03311fb91bf31a58343531f8f5156
  462. Author: kec9020 <kec9020@cs.rit.edu>
  463. Date: Mon May 9 23:12:38 2016 -0400
  464.  
  465. yup
  466.  
  467. commit 13b4c003b40a04ef3bb2837c0d368509f8a37fba
  468. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  469. Date: Mon May 9 22:53:39 2016 -0400
  470.  
  471. possible optimisation
  472.  
  473. commit f5785c8000e828b4ba2e55d89dcae9c34ab024e5
  474. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  475. Date: Mon May 9 22:48:33 2016 -0400
  476.  
  477. SURELY Working HERE !!!!
  478.  
  479. commit ef4d44ce567ac35a2b99942451e49f1b91544b22
  480. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  481. Date: Mon May 9 22:48:05 2016 -0400
  482.  
  483. SURELY Working HERE !!!!
  484.  
  485. commit 8959a7caf6cc632eb020014f9f0cb0c3fb959301
  486. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  487. Date: Mon May 9 22:43:49 2016 -0400
  488.  
  489. SURELY Working HERE !!!!
  490.  
  491. commit 0c1cdf74f26e709c84cf63856f65e4d1e074fab6
  492. Merge: 5c63ba5 4064232
  493. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  494. Date: Mon May 9 22:38:31 2016 -0400
  495.  
  496. Merge remote-tracking branch 'origin/master'
  497.  
  498. commit 5c63ba54400f55432db0fc5cd79e94fd0c65ced9
  499. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  500. Date: Mon May 9 22:38:18 2016 -0400
  501.  
  502. Working HERE !!!!
  503.  
  504. commit 406423260b9368ec24b5c4d87a545d708f4b7c4b
  505. Merge: ab93542 eb81c67
  506. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  507. Date: Mon May 9 22:17:27 2016 -0400
  508.  
  509. Merge remote-tracking branch 'origin/master'
  510.  
  511. commit ab9354202766e2ccff8e2538e5054d9598cd3ffa
  512. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  513. Date: Mon May 9 22:17:09 2016 -0400
  514.  
  515. !!!!testok
  516.  
  517. commit eb81c6765cd9ef922bacc7b0e0e3fb533ac57071
  518. Author: tws3466 <tws3466@cs.rit.edu>
  519. Date: Mon May 9 20:48:52 2016 -0400
  520.  
  521. prrrrretttttttififified
  522.  
  523. commit f5bb0165813a044aeee8978fd157dd2f9c498044
  524. Merge: 3f341f0 7d82299
  525. Author: tws3466 <tws3466@cs.rit.edu>
  526. Date: Mon May 9 20:46:59 2016 -0400
  527.  
  528. Merge remote-tracking branch 'origin/master'
  529.  
  530. # Conflicts:
  531. # testtest.txt
  532.  
  533. commit 3f341f08b3d066936a9bc387827d72a03834d1d7
  534. Author: tws3466 <tws3466@cs.rit.edu>
  535. Date: Mon May 9 20:42:47 2016 -0400
  536.  
  537. "Fixed Warnings"
  538.  
  539. commit 7d82299fbf1e45d5ce0ec667c51259469066ebb9
  540. Merge: b484c6b c888728
  541. Author: kec9020 <kec9020@cs.rit.edu>
  542. Date: Mon May 9 20:32:28 2016 -0400
  543.  
  544. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  545.  
  546. commit b484c6be2588f9218e8bb27222ad9dbe2dbd363f
  547. Author: kec9020 <kec9020@cs.rit.edu>
  548. Date: Mon May 9 20:32:08 2016 -0400
  549.  
  550. haspillar
  551.  
  552. commit c888728871b3df3cf016fb324a226aedefbeef88
  553. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  554. Date: Mon May 9 20:29:31 2016 -0400
  555.  
  556. okay
  557.  
  558. commit 22affbe8c740919b6a91ad77df01117fc2d3d316
  559. Merge: d1fe304 df1164b
  560. Author: tws3466 <tws3466@cs.rit.edu>
  561. Date: Mon May 9 19:58:17 2016 -0400
  562.  
  563. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  564.  
  565. commit f34771106ab3f015d9ceb97d0cbf796ce202e848
  566. Merge: e702ab9 df1164b
  567. Author: kec9020 <kec9020@cs.rit.edu>
  568. Date: Mon May 9 19:53:04 2016 -0400
  569.  
  570. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  571.  
  572. commit e702ab93dde4170439c7ec1881a17da2e7c84a13
  573. Author: kec9020 <kec9020@cs.rit.edu>
  574. Date: Mon May 9 19:52:42 2016 -0400
  575.  
  576. okay
  577.  
  578. commit df1164b3e6315f0d525fd41820bbbecf100e060f
  579. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  580. Date: Mon May 9 19:52:24 2016 -0400
  581.  
  582. okay
  583.  
  584. commit d1fe3042049b549b3fff178407fa748d69685ffe
  585. Merge: d8b7e47 486ba7b
  586. Author: tws3466 <tws3466@cs.rit.edu>
  587. Date: Mon May 9 19:34:23 2016 -0400
  588.  
  589. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  590.  
  591. commit 486ba7bf0674e07864e7fbb026c902ff64f04df0
  592. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  593. Date: Mon May 9 19:26:25 2016 -0400
  594.  
  595. okay
  596.  
  597. commit d8b7e477fd1b027ade15e781d50fe42972159e69
  598. Merge: 00bc9b2 15610d0
  599. Author: tws3466 <tws3466@cs.rit.edu>
  600. Date: Mon May 9 19:23:58 2016 -0400
  601.  
  602. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  603.  
  604. commit 00bc9b2b4a721bacab75febeabde29c92427e548
  605. Author: tws3466 <tws3466@cs.rit.edu>
  606. Date: Mon May 9 19:22:46 2016 -0400
  607.  
  608. fixen warnings
  609.  
  610. commit b82f373e729ae21670a8b2ff079f33f7e8cd5d3d
  611. Merge: 0244d0a 15610d0
  612. Author: kec9020 <kec9020@cs.rit.edu>
  613. Date: Mon May 9 19:22:34 2016 -0400
  614.  
  615. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  616.  
  617. commit 15610d06ffe541e5602e99a591078935f2991ae5
  618. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  619. Date: Mon May 9 19:22:00 2016 -0400
  620.  
  621. okay
  622.  
  623. commit 0244d0ad8207fc39bf83125058dd6c4b11784f9c
  624. Merge: d35c7ff ae9d0e5
  625. Author: kec9020 <kec9020@cs.rit.edu>
  626. Date: Mon May 9 19:20:44 2016 -0400
  627.  
  628. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  629.  
  630. commit d35c7ff81039792a3f9468cb404e093340764802
  631. Author: kec9020 <kec9020@cs.rit.edu>
  632. Date: Mon May 9 19:20:22 2016 -0400
  633.  
  634. have to commit to pull
  635.  
  636. commit ae9d0e5102eba373fa9d902ea7e9223d0789be2d
  637. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  638. Date: Mon May 9 19:17:32 2016 -0400
  639.  
  640. okay
  641.  
  642. commit c9ee5203aab9db92b98d125a8e70abde6a420031
  643. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  644. Date: Mon May 9 18:57:47 2016 -0400
  645.  
  646. okay
  647.  
  648. commit aa159deee1bc62da04281d9dfe4df379613f6750
  649. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  650. Date: Mon May 9 18:47:25 2016 -0400
  651.  
  652. okay
  653.  
  654. commit b47f420fe7b6331db3ddc164d05c137f50c82339
  655. Author: tws3466 <tws3466@cs.rit.edu>
  656. Date: Mon May 9 18:40:40 2016 -0400
  657.  
  658. Added comments to SafeConfig and LasersGUI
  659.  
  660. commit 68e6dcf4f74a951b222fa939935f524148e16518
  661. Merge: e4d349f d591919
  662. Author: tws3466 <tws3466@cs.rit.edu>
  663. Date: Mon May 9 18:29:51 2016 -0400
  664.  
  665. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  666.  
  667. commit d5919193487329fdec648506e5ba915be924970a
  668. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  669. Date: Mon May 9 18:29:24 2016 -0400
  670.  
  671. Fixes for backtracking. Still doesnt work
  672.  
  673. commit e4d349f666beaeb0d37631e22077ad3479af6b73
  674. Merge: 6aa6a1e 2600336
  675. Author: tws3466 <tws3466@cs.rit.edu>
  676. Date: Mon May 9 18:29:23 2016 -0400
  677.  
  678. merging comments in
  679.  
  680. commit 6aa6a1e0aeed7995799d9b36e4b2d865d0069caa
  681. Author: tws3466 <tws3466@cs.rit.edu>
  682. Date: Mon May 9 18:23:55 2016 -0400
  683.  
  684. SafeConfig comments, started LasersGUI comments
  685.  
  686. commit 6008780c5fa40cecb5d06f27d1f0e19be6064b87
  687. Author: tws3466 <tws3466@cs.rit.edu>
  688. Date: Mon May 9 18:20:49 2016 -0400
  689.  
  690. SafeConfig comments, started LasersGUI comments
  691.  
  692. commit 26003367d8d56e07311424c054d0e8c20f47edea
  693. Merge: 332b9c2 99ed1d4
  694. Author: kec9020 <kec9020@cs.rit.edu>
  695. Date: Mon May 9 18:20:21 2016 -0400
  696.  
  697. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  698.  
  699. commit 332b9c2b01fdf419d59cfb739a14b404a3062bc7
  700. Author: kec9020 <kec9020@cs.rit.edu>
  701. Date: Mon May 9 18:19:57 2016 -0400
  702.  
  703. getnextrow and getnextcol
  704.  
  705. commit 99ed1d4c2c5ac3ae4107c4f99e1772d76bb9f110
  706. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  707. Date: Mon May 9 18:05:48 2016 -0400
  708.  
  709. Fix for the safe config constructor program
  710.  
  711. commit 3bb4eb97737931daf6a1aeb8c6a1ba93fd91efe3
  712. Author: kec9020 <kec9020@cs.rit.edu>
  713. Date: Mon May 9 18:05:33 2016 -0400
  714.  
  715. worked on controllerPTUI run function
  716.  
  717. commit 409c0edebe1c4652c74e8c3151995bafe852bec6
  718. Author: kec9020 <kec9020@cs.rit.edu>
  719. Date: Mon May 9 17:41:13 2016 -0400
  720.  
  721. worked on controllerPTUI run function
  722.  
  723. commit 1a4cf790764a5b6a9ce6369f3f2863479e7e9f7c
  724. Merge: c1dd674 5140f26
  725. Author: kec9020 <kec9020@cs.rit.edu>
  726. Date: Mon May 9 17:39:14 2016 -0400
  727.  
  728. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  729.  
  730. commit c1dd6747d935be8a88fe7eababb7d0002348aaf5
  731. Author: kec9020 <kec9020@cs.rit.edu>
  732. Date: Mon May 9 17:38:59 2016 -0400
  733.  
  734. worked on controllerPTUI run function
  735.  
  736. commit 5140f26deb7275ab70804adfd4c8564c23ac6018
  737. Merge: 7a6d2d0 b1ca3b4
  738. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  739. Date: Mon May 9 17:38:34 2016 -0400
  740.  
  741. Merge remote-tracking branch 'origin/master'
  742.  
  743. commit 7a6d2d016c8b87b8cf76ccd6ce7e5d2591e0bdb7
  744. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  745. Date: Mon May 9 17:38:05 2016 -0400
  746.  
  747. Added gui helper methods
  748.  
  749. commit b1ca3b484c10e2eaa40d94615783b8f78be8cf69
  750. Author: kec9020 <kec9020@cs.rit.edu>
  751. Date: Mon May 9 16:51:54 2016 -0400
  752.  
  753. worked on controllerPTUI run function
  754.  
  755. commit f74f3ea6febe1fbfbe02bafe035fa1e21b4712f3
  756. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  757. Date: Mon May 9 10:34:20 2016 -0400
  758.  
  759. Fix for laserPTUI. but there are other errors
  760.  
  761. commit 6f7beaf465d273dfd4b7d40bd931ea127e8fd722
  762. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  763. Date: Mon May 9 10:13:14 2016 -0400
  764.  
  765. Wrote isvalid function v1
  766.  
  767. commit 29958e087cd388332fb1c9f1f1973010c8bc7f59
  768. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  769. Date: Sun May 8 18:56:10 2016 -0400
  770.  
  771. spell fix
  772.  
  773. commit ae7fedc23810502154c304a1d9f37e1fe9447f88
  774. Merge: fd6d2fb a1237e5
  775. Author: tws3466 <tws3466@cs.rit.edu>
  776. Date: Sun May 8 18:53:32 2016 -0400
  777.  
  778. Commmmmments
  779.  
  780. commit fd6d2fb5ffa6dc3e541c81f31fe767f6c7d9874a
  781. Author: tws3466 <tws3466@cs.rit.edu>
  782. Date: Sun May 8 18:49:13 2016 -0400
  783.  
  784. More comments
  785.  
  786. commit a1237e5f21c894d9732ebd5562f87edaa7f55889
  787. Author: kec9020 <kec9020@cs.rit.edu>
  788. Date: Sun May 8 18:47:45 2016 -0400
  789.  
  790. PilliarValidSoFar is updated
  791.  
  792. commit 18d3770774dcf7d263b37c3a6f16a04ae36e7710
  793. Merge: 90fc8bb 196756d
  794. Author: tws3466 <tws3466@cs.rit.edu>
  795. Date: Sun May 8 18:32:31 2016 -0400
  796.  
  797. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  798.  
  799. commit 196756de69dde9989ca661632496ecc6e457b387
  800. Merge: 4847de9 2034a9e
  801. Author: kec9020 <kec9020@cs.rit.edu>
  802. Date: Sun May 8 18:30:45 2016 -0400
  803.  
  804. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  805.  
  806. commit 4847de98fab9e9ff81ad981d1c0d9af3f99733fb
  807. Author: kec9020 <kec9020@cs.rit.edu>
  808. Date: Sun May 8 18:30:17 2016 -0400
  809.  
  810. PilliarValidSoFar is made
  811.  
  812. commit 2034a9e8c3562289fe5f3947eebe00b0adc6864b
  813. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  814. Date: Sun May 8 18:01:46 2016 -0400
  815.  
  816. get successors fixes
  817.  
  818. commit 90fc8bba714b8c39d13ee2015c70f44d8506ae42
  819. Merge: 22288ba 6ef835f
  820. Author: tws3466 <tws3466@cs.rit.edu>
  821. Date: Sun May 8 17:43:56 2016 -0400
  822.  
  823. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  824.  
  825. commit 6ef835f88b74c2d6e790a176431385a891d4c740
  826. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  827. Date: Sun May 8 17:43:27 2016 -0400
  828.  
  829. Fix for fnfe
  830.  
  831. commit 22288ba00d63a7d8d3ef9c01237b59e0626465a4
  832. Merge: da46c5e 35e2d70
  833. Author: tws3466 <tws3466@cs.rit.edu>
  834. Date: Sun May 8 17:41:05 2016 -0400
  835.  
  836. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  837.  
  838. commit 35e2d7026554cc11fc93197b76f4cf0a74df926a
  839. Merge: a893951 d8cc47e
  840. Author: kec9020 <kec9020@cs.rit.edu>
  841. Date: Sun May 8 17:40:02 2016 -0400
  842.  
  843. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  844.  
  845. commit a893951b0340c0cf563949f388a25061b79a07a3
  846. Author: kec9020 <kec9020@cs.rit.edu>
  847. Date: Sun May 8 17:39:45 2016 -0400
  848.  
  849. Fixed up ControllerPTUI and LasersPTUI constructor. Got rid of the LasersPTUI main method
  850.  
  851. commit da46c5e0afc51dd14450eea87bb6502911f442a2
  852. Merge: 3ac277a d8cc47e
  853. Author: tws3466 <tws3466@cs.rit.edu>
  854. Date: Sun May 8 17:39:02 2016 -0400
  855.  
  856. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  857.  
  858. commit 3ac277a73a0ab9e0bc2b035461623cfef6bd6a36
  859. Author: tws3466 <tws3466@cs.rit.edu>
  860. Date: Sun May 8 17:38:34 2016 -0400
  861.  
  862. Some comments
  863.  
  864. commit d8cc47ebdebe21c5251d27bb4ee81d3c50b7c6fb
  865. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  866. Date: Sun May 8 17:37:18 2016 -0400
  867.  
  868. Added get successors method for safeconfig
  869.  
  870. commit cb75550afb94dd30b3d8bdf297b90a0d474f2163
  871. Author: kec9020 <kec9020@cs.rit.edu>
  872. Date: Sun May 8 17:07:44 2016 -0400
  873.  
  874. updated the getCols() and getRows()
  875.  
  876. commit 2ba82a129092d652de0fa80744ebc9be90f89005
  877. Merge: fb5bc32 3501667
  878. Author: kec9020 <kec9020@cs.rit.edu>
  879. Date: Sun May 8 17:06:27 2016 -0400
  880.  
  881. updated the getCols() and getRows()
  882.  
  883. commit fb5bc322553c63bbceadbcd2ea92e56652d9d9fe
  884. Author: kec9020 <kec9020@cs.rit.edu>
  885. Date: Sun May 8 16:47:37 2016 -0400
  886.  
  887. made buttons to go when there are pillars
  888.  
  889. commit 2515f8b38e7ce7fa599cd5a90400c47c0fad3b3f
  890. Author: kec9020 <kec9020@cs.rit.edu>
  891. Date: Sun May 8 16:46:21 2016 -0400
  892.  
  893. changed how safeConfig returns
  894.  
  895. commit 35016675afb5cb7531dc62ffff32b9f415a486a1
  896. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  897. Date: Sun May 8 16:44:40 2016 -0400
  898.  
  899. Added updated for lasersptui, added model functions
  900.  
  901. commit f0a2b23842a350fb0cab848883d904f17ea18cbc
  902. Merge: b00676b 4e4725d
  903. Author: kec9020 <kec9020@cs.rit.edu>
  904. Date: Sun May 8 16:21:11 2016 -0400
  905.  
  906. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  907.  
  908. commit b00676b6eb28706aabb50b3945489d7e383e5555
  909. Author: kec9020 <kec9020@cs.rit.edu>
  910. Date: Sun May 8 16:20:40 2016 -0400
  911.  
  912. made buttons to go when there are pillars
  913.  
  914. commit 4e4725d7059329faa2e9e2e09be5332b0a21f4e1
  915. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  916. Date: Sun May 8 16:19:22 2016 -0400
  917.  
  918. Changed function signatures
  919.  
  920. commit bb9992256dfcc2f20c0efe99888f35f892de995c
  921. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  922. Date: Sun May 8 15:54:18 2016 -0400
  923.  
  924. possible backtracking with path
  925.  
  926. commit a0b600e9f1cdfe2293f291adad4cad89c0b6c290
  927. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  928. Date: Sun May 8 15:52:25 2016 -0400
  929.  
  930. possible backtracking with path
  931.  
  932. commit 0738729dd477613cfe83c0f1afadab48c5436723
  933. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  934. Date: Sun May 8 15:51:08 2016 -0400
  935.  
  936. possible backtracking with path
  937.  
  938. commit 475b96d23e1a377394a3bf044be7bc6a961140c4
  939. Merge: ff8bd56 1f0112e
  940. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  941. Date: Sun May 8 15:37:45 2016 -0400
  942.  
  943. Merge remote-tracking branch 'origin/master'
  944.  
  945. commit ff8bd56de50d2b95e90fee4227aa019cc4b97863
  946. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  947. Date: Sun May 8 15:37:32 2016 -0400
  948.  
  949. Added model, added backtracking path
  950.  
  951. commit 1f0112e5fb72881627a345ad84319d3673682cbc
  952. Merge: 9f511b5 df9eced
  953. Author: kec9020 <kec9020@cs.rit.edu>
  954. Date: Sun May 8 15:27:47 2016 -0400
  955.  
  956. another merge conflict
  957.  
  958. commit 9f511b5ebf593474079a8e98479d77aab8d2f07a
  959. Author: kec9020 <kec9020@cs.rit.edu>
  960. Date: Sun May 8 15:08:44 2016 -0400
  961.  
  962. Finished the constructor to make a safeConfiguration from a file.
  963.  
  964. commit df9ecedb4e9e44852edfedc947d79fe67b68ecdd
  965. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  966. Date: Sun May 8 15:08:13 2016 -0400
  967.  
  968. Added functions to model
  969.  
  970. commit efd3fd778d7d23bf71a342a5a6aadd77e9a75917
  971. Merge: 40c3efc 5e6dfcc
  972. Author: kec9020 <kec9020@cs.rit.edu>
  973. Date: Sun May 8 14:41:58 2016 -0400
  974.  
  975. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  976.  
  977. commit 5e6dfccdc155e4eadb9c6f244858ebf9f47c97cf
  978. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  979. Date: Sun May 8 14:41:29 2016 -0400
  980.  
  981. ¡¡¡~~~First import for project 2-2 fix
  982.  
  983. commit 40c3efc83ad0a95a38ff8411e1d66cdbaebd945b
  984. Merge: b68cf73 7b49826
  985. Author: kec9020 <kec9020@cs.rit.edu>
  986. Date: Sun May 8 14:40:10 2016 -0400
  987.  
  988. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  989.  
  990. commit b68cf73713e7e7beef89dd29513b2c4c5c04e392
  991. Merge: 9116908 1d4f75b
  992. Author: kec9020 <kec9020@cs.rit.edu>
  993. Date: Sun May 8 14:39:08 2016 -0400
  994.  
  995. merge conflict, have to commit
  996.  
  997. commit 7b4982690dbfaa63e3ecdf58636c8785b3f063a5
  998. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  999. Date: Sun May 8 14:38:20 2016 -0400
  1000.  
  1001. ¡¡¡~~~First import for project 2-2
  1002.  
  1003. commit 9116908622a6e5cccc59263cd2eac1a64bebabed
  1004. Author: kec9020 <kec9020@cs.rit.edu>
  1005. Date: Fri Apr 15 22:42:23 2016 -0400
  1006.  
  1007. fixed up remove
  1008.  
  1009. commit 1d4f75bf84125d692434a2b60f311c777ad1584d
  1010. Merge: e6f4339 4a71d46
  1011. Author: tws3466 <tws3466@cs.rit.edu>
  1012. Date: Fri Apr 15 22:22:07 2016 -0400
  1013.  
  1014. Merge remote-tracking branch 'origin/master'
  1015.  
  1016. # Conflicts:
  1017. # src/LasersPTUI.java
  1018.  
  1019. commit e6f433996bd1a91245f8c9733039b4489b25832c
  1020. Author: tws3466 <tws3466@cs.rit.edu>
  1021. Date: Fri Apr 15 22:13:37 2016 -0400
  1022.  
  1023. Even Prettier
  1024.  
  1025. commit 4a71d465d6ba258a96d9c9b616d5eb859e592c4b
  1026. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1027. Date: Fri Apr 15 21:55:40 2016 -0400
  1028.  
  1029. Some io related fix
  1030.  
  1031. commit faef24ad0634ab2e700956f6a189e4eca96dc549
  1032. Merge: 6c2f2e4 06684a2
  1033. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1034. Date: Fri Apr 15 21:50:17 2016 -0400
  1035.  
  1036. Merge remote-tracking branch 'origin/master'
  1037.  
  1038. commit 6c2f2e40123d0d0d969592b4e3ff4dc0249c0f8a
  1039. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1040. Date: Fri Apr 15 21:49:58 2016 -0400
  1041.  
  1042. Some io related fix
  1043.  
  1044. commit 06684a25b19eaf8c2f27adbec41eb9fe87da5364
  1045. Author: tws3466 <tws3466@cs.rit.edu>
  1046. Date: Fri Apr 15 21:42:31 2016 -0400
  1047.  
  1048. remove laser out of bounds error fix
  1049.  
  1050. commit b60f24c56e18236ab935d013c11ea1c8f1266e78
  1051. Merge: cc3ae0d 2dfb729
  1052. Author: tws3466 <tws3466@cs.rit.edu>
  1053. Date: Fri Apr 15 21:41:39 2016 -0400
  1054.  
  1055. remove laser out of bounds error fix
  1056.  
  1057. commit 2dfb7290adf9db331ee7a2640ee2bfc1761c2f7b
  1058. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1059. Date: Fri Apr 15 21:38:54 2016 -0400
  1060.  
  1061. Some io related fix
  1062.  
  1063. commit d09be6c565bab254467f5dd719e3cdace79442e3
  1064. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1065. Date: Fri Apr 15 21:34:14 2016 -0400
  1066.  
  1067. Some io related fix
  1068.  
  1069. commit 297bfc7e2140b40f63ca409e8cd5d464d2ab7d67
  1070. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1071. Date: Fri Apr 15 21:31:33 2016 -0400
  1072.  
  1073. Some io related fix
  1074.  
  1075. commit cc3ae0d943e62378ca2f9ed628cdcd0a14891b26
  1076. Merge: 24607c0 c4bafeb
  1077. Author: tws3466 <tws3466@cs.rit.edu>
  1078. Date: Fri Apr 15 21:31:26 2016 -0400
  1079.  
  1080. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1081.  
  1082. commit 24607c0ac27597e29c41350ede2d9322221f5212
  1083. Author: tws3466 <tws3466@cs.rit.edu>
  1084. Date: Fri Apr 15 21:30:58 2016 -0400
  1085.  
  1086. fixed verify ouput
  1087.  
  1088. commit c4bafeb5e330cd4d9030a34f4b8923e923de30f2
  1089. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1090. Date: Fri Apr 15 21:30:08 2016 -0400
  1091.  
  1092. Some io related fix
  1093.  
  1094. commit acb2528f9ef6bbb847799a8367446c796ca6c405
  1095. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1096. Date: Fri Apr 15 21:24:32 2016 -0400
  1097.  
  1098. Some io related fix
  1099.  
  1100. commit 48f69f29836f482e4648d374cd036c9944ce8d6e
  1101. Author: tws3466 <tws3466@cs.rit.edu>
  1102. Date: Fri Apr 15 21:18:19 2016 -0400
  1103.  
  1104. fixed verify ouput
  1105.  
  1106. commit bbcd30df7c9561f5c466a9e14fe19171a60bcbfc
  1107. Author: tws3466 <tws3466@cs.rit.edu>
  1108. Date: Fri Apr 15 21:12:20 2016 -0400
  1109.  
  1110. fixed remove function
  1111.  
  1112. commit ac002840c6952bfa1663f4c235a84e163c52a0d3
  1113. Author: tws3466 <tws3466@cs.rit.edu>
  1114. Date: Fri Apr 15 21:10:38 2016 -0400
  1115.  
  1116. fixed remove function
  1117.  
  1118. commit 8b7fa308b6ecf8d36fd51c8f342082541394d690
  1119. Merge: 0d52faa cfda8e4
  1120. Author: tws3466 <tws3466@cs.rit.edu>
  1121. Date: Fri Apr 15 20:19:48 2016 -0400
  1122.  
  1123. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1124.  
  1125. commit 0d52faa84f516d38e147bbad56bccba33e9e51e2
  1126. Author: tws3466 <tws3466@cs.rit.edu>
  1127. Date: Fri Apr 15 20:19:22 2016 -0400
  1128.  
  1129. Pretty
  1130.  
  1131. commit dbd40febadef6eb388b82ab12aaae0c73d3d95cc
  1132. Merge: bccc39c 8c65fb4
  1133. Author: tws3466 <tws3466@cs.rit.edu>
  1134. Date: Fri Apr 15 20:19:07 2016 -0400
  1135.  
  1136. Pretty
  1137.  
  1138. commit cfda8e401dad7de123195a631137089890932a49
  1139. Merge: 9bd66fb 3926f79
  1140. Author: kec9020 <kec9020@cs.rit.edu>
  1141. Date: Fri Apr 15 20:16:21 2016 -0400
  1142.  
  1143. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1144.  
  1145. commit 9bd66fbb6f8a5e978c890e09021cb4f5c66b8655
  1146. Author: kec9020 <kec9020@cs.rit.edu>
  1147. Date: Fri Apr 15 20:16:00 2016 -0400
  1148.  
  1149. fixed up remove
  1150.  
  1151. commit 3926f79f2db59658d95020e79c685998b1b457f9
  1152. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1153. Date: Fri Apr 15 20:15:12 2016 -0400
  1154.  
  1155. Logical fix for check array index <-1
  1156.  
  1157. commit bccc39ca6808aee23f0403483830909156fb6eb4
  1158. Author: tws3466 <tws3466@cs.rit.edu>
  1159. Date: Fri Apr 15 20:03:14 2016 -0400
  1160.  
  1161. Max pretty
  1162.  
  1163. commit 8c65fb41bbc34f97deb127cb5811f438bfbadb19
  1164. Author: kec9020 <kec9020@cs.rit.edu>
  1165. Date: Fri Apr 15 20:02:50 2016 -0400
  1166.  
  1167. fixed verify outputs
  1168.  
  1169. commit 81e479c9630682f42ef7d3f01c9ad5a57d7f3b7b
  1170. Merge: 414e0ec 770bdf2
  1171. Author: tws3466 <tws3466@cs.rit.edu>
  1172. Date: Fri Apr 15 20:01:52 2016 -0400
  1173.  
  1174. Max pretty
  1175.  
  1176. commit c3582e9e7e34db5e570908e11d8f88553b156ab1
  1177. Merge: 6f76d0a 8d08427
  1178. Author: kec9020 <kec9020@cs.rit.edu>
  1179. Date: Fri Apr 15 19:53:55 2016 -0400
  1180.  
  1181. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1182.  
  1183. commit 6f76d0a1ea0b2fa302037a5f081df06188bb5980
  1184. Author: kec9020 <kec9020@cs.rit.edu>
  1185. Date: Fri Apr 15 19:53:37 2016 -0400
  1186.  
  1187. made help prettier
  1188.  
  1189. commit 8d084278a680116191c1b9326ff16a38b08522d0
  1190. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1191. Date: Fri Apr 15 19:53:21 2016 -0400
  1192.  
  1193. Possible output specification fix
  1194.  
  1195. commit 00ce6fa8fc8b762b8603d56cccbb8e3fb215fa4b
  1196. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1197. Date: Fri Apr 15 19:51:32 2016 -0400
  1198.  
  1199. Possible output specification fix
  1200.  
  1201. commit 0357c9fcb984b7b01ece9b955c36b66f16f3620a
  1202. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1203. Date: Fri Apr 15 19:50:36 2016 -0400
  1204.  
  1205. Possible output specification fix
  1206.  
  1207. commit 414e0ec973d5042f06858540e2b7c4ac9f9aeeff
  1208. Author: tws3466 <tws3466@cs.rit.edu>
  1209. Date: Fri Apr 15 19:50:08 2016 -0400
  1210.  
  1211. super pretty
  1212.  
  1213. commit 770bdf2776fcf3905f83e523126d1f1bca356e9a
  1214. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1215. Date: Fri Apr 15 19:49:02 2016 -0400
  1216.  
  1217. Possible output specification fix
  1218.  
  1219. commit ebc28514b46d7bd5c73a63067d547a14ae244e0a
  1220. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1221. Date: Fri Apr 15 19:47:59 2016 -0400
  1222.  
  1223. Possible output specification fix
  1224.  
  1225. commit 03f547bcbada0b338d2cc444d3ea96001268969e
  1226. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1227. Date: Fri Apr 15 19:44:00 2016 -0400
  1228.  
  1229. Possible output specification fix
  1230.  
  1231. commit e31306fd06d8147d6263511352299c712c0a5df0
  1232. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1233. Date: Fri Apr 15 19:42:36 2016 -0400
  1234.  
  1235. Possible output specification fix
  1236.  
  1237. commit 1f96b80cab2c1fcc2d614870d70cc1d7b9333f77
  1238. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1239. Date: Fri Apr 15 19:41:15 2016 -0400
  1240.  
  1241. Possible output specification fix
  1242.  
  1243. commit 08e281d34660a05d3ec85b1321a55de9bc5c319d
  1244. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1245. Date: Fri Apr 15 19:39:58 2016 -0400
  1246.  
  1247. Possible output specification fix
  1248.  
  1249. commit 2e860531199f070f395da2e9f52142ddcdff09c3
  1250. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1251. Date: Fri Apr 15 19:39:13 2016 -0400
  1252.  
  1253. Possible output specification fix
  1254.  
  1255. commit 94444e160704e2b5989f5736e1f0c91cfb065314
  1256. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1257. Date: Fri Apr 15 19:37:25 2016 -0400
  1258.  
  1259. Possible output specification fix
  1260.  
  1261. commit 3621d5bbf2c623e31cb06a12cdc491f699017914
  1262. Merge: 7910695 0c45ad2
  1263. Author: tws3466 <tws3466@cs.rit.edu>
  1264. Date: Fri Apr 15 19:36:36 2016 -0400
  1265.  
  1266. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1267.  
  1268. commit 0c45ad2089356484ede02fb4b58328cd9e49e275
  1269. Merge: a53f26e cc47c4c
  1270. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1271. Date: Fri Apr 15 19:35:20 2016 -0400
  1272.  
  1273. Merge remote-tracking branch 'origin/master'
  1274.  
  1275. commit 791069581088f68089399d4ef6af7cc2b5099eb1
  1276. Merge: 93f4bdf cc47c4c
  1277. Author: tws3466 <tws3466@cs.rit.edu>
  1278. Date: Fri Apr 15 19:35:18 2016 -0400
  1279.  
  1280. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1281.  
  1282. commit a53f26ee708ef5bdf1d408b74c3d96e3f4b8b1b2
  1283. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1284. Date: Fri Apr 15 19:35:06 2016 -0400
  1285.  
  1286. Possible output specification fix
  1287.  
  1288. commit 93f4bdf0c903c8402c8ae5276ab941986a5b7887
  1289. Author: tws3466 <tws3466@cs.rit.edu>
  1290. Date: Fri Apr 15 19:34:52 2016 -0400
  1291.  
  1292. prettyfication
  1293.  
  1294. commit 516c59e5da2fb58ee955d1e3d012d8cbf3c31f98
  1295. Merge: 41bcbfb 606d7f1
  1296. Author: tws3466 <tws3466@cs.rit.edu>
  1297. Date: Fri Apr 15 19:34:08 2016 -0400
  1298.  
  1299. prettyfication
  1300.  
  1301. commit cc47c4cd696628f171efee72d943031aea6075e8
  1302. Author: kec9020 <kec9020@cs.rit.edu>
  1303. Date: Fri Apr 15 19:33:15 2016 -0400
  1304.  
  1305. made help prettier
  1306.  
  1307. commit 796431aa805948b67295955e192044793628c66c
  1308. Merge: 4117217 a08d701
  1309. Author: kec9020 <kec9020@cs.rit.edu>
  1310. Date: Fri Apr 15 19:32:42 2016 -0400
  1311.  
  1312. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1313.  
  1314. commit 41172177ffd524114ff521a09c236d71d23a4fe1
  1315. Author: kec9020 <kec9020@cs.rit.edu>
  1316. Date: Fri Apr 15 19:32:16 2016 -0400
  1317.  
  1318. made help prettier
  1319.  
  1320. commit a08d7018e63f04b99ca91cb118bac4bbb519e495
  1321. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1322. Date: Fri Apr 15 19:29:35 2016 -0400
  1323.  
  1324. Possible output specification fix
  1325.  
  1326. commit baf8b774212fc503e2b5075be61b9f3d7df46686
  1327. Merge: 83c00f5 606d7f1
  1328. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1329. Date: Fri Apr 15 19:25:32 2016 -0400
  1330.  
  1331. Merge remote-tracking branch 'origin/master'
  1332.  
  1333. commit 83c00f5cf941c7c6d8720883eb73e828b0d6bc21
  1334. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1335. Date: Fri Apr 15 19:25:20 2016 -0400
  1336.  
  1337. I dont know why that happened error
  1338.  
  1339. commit 41bcbfb3a5cd3b0b17456648a2443303c3d13aea
  1340. Author: tws3466 <tws3466@cs.rit.edu>
  1341. Date: Fri Apr 15 19:10:18 2016 -0400
  1342.  
  1343. more prettying
  1344.  
  1345. commit 606d7f199f171e286ef246eb875d07e723cd2e15
  1346. Merge: dbae8fa 8d87e6a
  1347. Author: kec9020 <kec9020@cs.rit.edu>
  1348. Date: Fri Apr 15 19:08:56 2016 -0400
  1349.  
  1350. fixed up verify
  1351.  
  1352. commit dbae8fa91c13426b08896651dd920a20dd956fdf
  1353. Author: kec9020 <kec9020@cs.rit.edu>
  1354. Date: Fri Apr 15 19:03:16 2016 -0400
  1355.  
  1356. fixed verify issues
  1357.  
  1358. commit 8d87e6a79a83813d5922f52f0610b336d85cfef7
  1359. Merge: 10d97d2 045e0ca
  1360. Author: tws3466 <tws3466@cs.rit.edu>
  1361. Date: Fri Apr 15 19:00:57 2016 -0400
  1362.  
  1363. prettying
  1364.  
  1365. commit 10d97d201cbfb75b9e4d1cdac6cbb04ecba1d039
  1366. Author: tws3466 <tws3466@cs.rit.edu>
  1367. Date: Fri Apr 15 18:45:12 2016 -0400
  1368.  
  1369. Comments and prettying
  1370.  
  1371. commit 045e0ca2edc3905c03520b6b4d701cfd3567e042
  1372. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1373. Date: Fri Apr 15 18:33:58 2016 -0400
  1374.  
  1375. Possible scanner class fix
  1376.  
  1377. commit 4cb2b8f2b428d49aa3c38d8a676647d7254f4f38
  1378. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1379. Date: Fri Apr 15 18:31:06 2016 -0400
  1380.  
  1381. Possible scanner class fix
  1382.  
  1383. commit 461f296029493cf5c54d8d8da1c7ac21b6a65d80
  1384. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1385. Date: Fri Apr 15 18:29:43 2016 -0400
  1386.  
  1387. Possible scanner class fix
  1388.  
  1389. commit 9c4f0b06d5473e6142ed7d324fad1a12d1d76a09
  1390. Author: kec9020 <kec9020@cs.rit.edu>
  1391. Date: Fri Apr 15 18:27:04 2016 -0400
  1392.  
  1393. fixed laser issues
  1394.  
  1395. commit 1903c2e406ff623ce24041032dcff5c180d296d1
  1396. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1397. Date: Fri Apr 15 18:23:12 2016 -0400
  1398.  
  1399. print formatting
  1400.  
  1401. commit f1e782ede1bd6170014454abb686f5bb25183397
  1402. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1403. Date: Fri Apr 15 18:15:22 2016 -0400
  1404.  
  1405. Fix for pillar check. Removed debug output
  1406.  
  1407. commit b457d33c4b38d7ffc3dc158d2fd8e82894e3960f
  1408. Merge: d5ea3c8 06a98c5
  1409. Author: kec9020 <kec9020@cs.rit.edu>
  1410. Date: Fri Apr 15 18:07:53 2016 -0400
  1411.  
  1412. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1413.  
  1414. commit d5ea3c8a9d7b8b6633edff4c06b335a1a0c755fd
  1415. Author: kec9020 <kec9020@cs.rit.edu>
  1416. Date: Fri Apr 15 18:06:14 2016 -0400
  1417.  
  1418. minor bug fix
  1419.  
  1420. commit 06a98c5a3e495195cca0b35f9a11d4d9201f1843
  1421. Merge: cf18baf 0283764
  1422. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1423. Date: Fri Apr 15 18:01:44 2016 -0400
  1424.  
  1425. Merge remote-tracking branch 'origin/master'
  1426.  
  1427. commit cf18baf7a2c809a15401a66b6d7edf10e350d716
  1428. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1429. Date: Fri Apr 15 18:01:29 2016 -0400
  1430.  
  1431. Fixed cmd endline issue
  1432.  
  1433. commit 02837646b8a5cf1a41720b7915d22d5bf27d6ca5
  1434. Merge: 0d4bdb2 5c2bead
  1435. Author: kec9020 <kec9020@cs.rit.edu>
  1436. Date: Fri Apr 15 18:01:05 2016 -0400
  1437.  
  1438. fixed the display method
  1439.  
  1440. commit 0d4bdb20bad1949d116fe91e2aca75c00be64910
  1441. Author: kec9020 <kec9020@cs.rit.edu>
  1442. Date: Fri Apr 15 17:50:05 2016 -0400
  1443.  
  1444. retrying
  1445.  
  1446. commit 65d3d1305a32b9376fc633b3932da35a75895b97
  1447. Merge: 4a9c3e7 ec58b33
  1448. Author: kec9020 <kec9020@cs.rit.edu>
  1449. Date: Fri Apr 15 17:49:12 2016 -0400
  1450.  
  1451. retrying
  1452.  
  1453. commit 5c2bead52d93611646c01ae3e559e7d0e4b3cd1c
  1454. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1455. Date: Fri Apr 15 17:43:23 2016 -0400
  1456.  
  1457. Added first version of file based input. Requires fixing
  1458.  
  1459. commit 43f9774e4a2de6ff1b35c4f0f888a475ddd36bf1
  1460. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1461. Date: Fri Apr 15 17:14:25 2016 -0400
  1462.  
  1463. Logical fixes. Changed order of checking in the go up,right,left,down snippets
  1464.  
  1465. commit 25b4793c00a2c0b5ea611682b25a9294c776cd52
  1466. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1467. Date: Fri Apr 15 15:46:03 2016 -0400
  1468.  
  1469. Logical fixes . program does not run so far
  1470.  
  1471. commit 711839c14360dc6b16159ddf59fd471b3ae82cd8
  1472. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1473. Date: Fri Apr 15 15:18:27 2016 -0400
  1474.  
  1475. Created constructors for safeconfig. Extracted file reading logic into a utility function.
  1476.  
  1477. commit 3894f98f01d6756ff6a3c97e803c84871b145889
  1478. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1479. Date: Thu Apr 14 13:55:09 2016 -0400
  1480.  
  1481. Fix for laser logic.
  1482.  
  1483. commit 58f61ce34e3eddf129c7e0e07d77dbfb9b242d79
  1484. Merge: 6c454d8 ec58b33
  1485. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1486. Date: Thu Apr 14 13:54:12 2016 -0400
  1487.  
  1488. Merge remote-tracking branch 'origin/master'
  1489.  
  1490. # Conflicts:
  1491. # src/SafeConfig.java
  1492.  
  1493. commit 6c454d832c38b851c79fbc1db6356570f2fd07fe
  1494. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1495. Date: Thu Apr 14 13:51:07 2016 -0400
  1496.  
  1497. Added laser check logic. Please verify it
  1498.  
  1499. commit 4a9c3e7d02ad869c7b3397c6c388a0ad596a860d
  1500. Author: kec9020 <kec9020@cs.rit.edu>
  1501. Date: Thu Apr 14 13:51:17 2016 -0400
  1502.  
  1503. worked on verifying based on Lasres hitting each other
  1504.  
  1505. commit ec58b334232017c994142fdfaee86836d2b88f20
  1506. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1507. Date: Thu Apr 14 13:51:07 2016 -0400
  1508.  
  1509. Added laser check logic. Please verify it
  1510.  
  1511. commit 02a9db05eacb455a31c2a1493253456dd9528281
  1512. Author: kec9020 <kec9020@cs.rit.edu>
  1513. Date: Thu Apr 14 13:11:55 2016 -0400
  1514.  
  1515. worked on verifying based on pillar
  1516.  
  1517. commit d3f0085b878f007a72d319c50ce394b8727be98a
  1518. Author: kec9020 <kec9020@cs.rit.edu>
  1519. Date: Thu Apr 14 10:42:30 2016 -0400
  1520.  
  1521. Finished the display method and fixed the throws error issue
  1522.  
  1523. commit 0c967c6d3bf99bc3bcb19a4483d2a7bf9891cfad
  1524. Author: kec9020 <kec9020@cs.rit.edu>
  1525. Date: Wed Apr 13 16:16:31 2016 -0400
  1526.  
  1527. Worked on the hlp, quit, and display functions
  1528.  
  1529. commit 36cd46cecf766d1c79eb7788730d386a20c2cfcc
  1530. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1531. Date: Tue Apr 12 20:13:44 2016 -0400
  1532.  
  1533. Syntax error fix
  1534.  
  1535. commit da74c9845fbd9500e4759e67c876e8ffe57aaf6f
  1536. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1537. Date: Tue Apr 12 16:35:00 2016 -0400
  1538.  
  1539. Started verify. Please try to solve the fixmes
  1540.  
  1541. commit 7d826937e07ccace6b541a45d17fb28ae3e7640a
  1542. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1543. Date: Tue Apr 12 16:22:01 2016 -0400
  1544.  
  1545. First two functions done
  1546.  
  1547. commit 67a8384dcecae6a43b991055399e47dde6a201e7
  1548. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1549. Date: Tue Apr 12 15:46:31 2016 -0400
  1550.  
  1551. Created basic skeleton for arguments case handling even more
  1552.  
  1553. commit 710f33f865a4521823c14b6d5c092c48b30e9d22
  1554. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1555. Date: Tue Apr 12 15:32:07 2016 -0400
  1556.  
  1557. Created basic skeleton for arguments case handling
  1558.  
  1559. commit 413bdef81d48ae40d4c20bf3ac1d1f85853fab75
  1560. Merge: 02d8311 4eab632
  1561. Author: tws3466 <tws3466@cs.rit.edu>
  1562. Date: Tue Apr 12 15:21:49 2016 -0400
  1563.  
  1564. Merge remote-tracking branch 'origin/master'
  1565.  
  1566. commit 02d8311b12b996300b5cd24e5b95c9c62980cb30
  1567. Author: tws3466 <tws3466@cs.rit.edu>
  1568. Date: Tue Apr 12 15:21:05 2016 -0400
  1569.  
  1570. Heres a comment
  1571.  
  1572. commit 4eab632847fa6f9b4484645e22de8ca4dc8cded4
  1573. Author: kec9020 <kec9020@cs.rit.edu>
  1574. Date: Tue Apr 12 15:18:24 2016 -0400
  1575.  
  1576. Initial revision2
  1577.  
  1578. commit 63e113f01593408b5e888a13865f867a967cee71
  1579. Merge: 1cce2e7 04c3e82
  1580. Author: tws3466 <tws3466@cs.rit.edu>
  1581. Date: Tue Apr 12 15:12:46 2016 -0400
  1582.  
  1583. Merge branch 'master' of ssh://glados.cs.rit.edu/home/group/s142/p142-02k/Courses/GIT/Lasers
  1584.  
  1585. # Conflicts:
  1586. # src/LasersPTUI.java
  1587.  
  1588. commit 1cce2e7796afc1dc0b535775295a4890ad64dcb0
  1589. Author: tws3466 <tws3466@cs.rit.edu>
  1590. Date: Tue Apr 12 15:07:32 2016 -0400
  1591.  
  1592. Initial Revision
  1593.  
  1594. commit 04c3e828e95ac3a66de51c9145aff249b6fd6dd8
  1595. Author: harshvardhangupta <harshvardhan_gupta@yahoo.com>
  1596. Date: Tue Apr 12 15:05:17 2016 -0400
  1597.  
  1598. Initial Revision. GoodLuck
  1599.  
  1600. commit 71972cfb8c4932dd33b0ff676540882434503833
  1601. Author: tws3466 <tws3466@cs.rit.edu>
  1602. Date: Tue Apr 12 14:54:36 2016 -0400
  1603.  
  1604. Initial Revision
  1605.  
  1606. commit 6f9f611a2f625e929083f4924d1589b0e3b24ee6
  1607. Author: tws3466 <tws3466@cs.rit.edu>
  1608. Date: Tue Apr 12 14:48:33 2016 -0400
  1609.  
  1610. Initial Revision
  1611.  
  1612. commit 2bcaefe490a8ef4613835c351f7dc23d0b77582a
  1613. Author: tws3466 <tws3466@cs.rit.edu>
  1614. Date: Tue Apr 12 14:31:44 2016 -0400
  1615.  
  1616. Initial Revision
  1617.  
  1618. commit f1de5c5c1d8d613df0260924b2ad98ba705193fb
  1619. Author: tws3466 <tws3466@cs.rit.edu>
  1620. Date: Tue Apr 12 14:27:59 2016 -0400
  1621.  
  1622. Initial Revision
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!