| 
							
							
								 Vinta | 7623c023ee | Merge remote-tracking branch 'checkcheckzz/master' Conflicts:
	README.md
resolved | 2014-07-01 23:04:24 +08:00 |  | 
			
				
					| 
							
							
								 Zach | 6e546264e0 | add django-cms to cms | 2014-07-01 07:57:35 -07:00 |  | 
			
				
					| 
							
							
								 Zach | 7efb148199 | add Wikipedia, python-instagram on 3rd party apis | 2014-07-01 07:52:59 -07:00 |  | 
			
				
					| 
							
							
								 Vinta | 184b7eecbf | add Spitfire, remove webstring | 2014-07-01 22:51:17 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | 86d077c116 | Merge remote-tracking branch 'vndmtrx/master' Conflicts:
	README.md
resovled | 2014-07-01 22:45:19 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | 2198cada0f | Merge remote-tracking branch 'agroszer/master' Conflicts:
	README.md
resolved | 2014-07-01 22:44:03 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | 8026b54d5c | Merge pull request #25 from emijrp/master fixing typo: Aanalysis -> Analysis | 2014-07-01 22:31:55 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | bb9b33d02e | Merge pull request #21 from aleasoluciones/master Add mamba & doublex | 2014-07-01 21:59:08 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | 6919b88652 | Merge pull request #19 from shivam5992/master added fuckit and tkinter | 2014-07-01 21:55:35 +08:00 |  | 
			
				
					| 
							
							
								 Emilio J. Rodríguez-Posada | b56e38aba3 | fixing typo: Aanalysis -> Analysis | 2014-07-01 15:51:54 +02:00 |  | 
			
				
					| 
							
							
								 Vinta | 0846aeb5c7 | Merge pull request #17 from checkcheckzz/master add you-get and coursera on video | 2014-07-01 21:36:27 +08:00 |  | 
			
				
					| 
							
							
								 Eduardo Rolim | 08f906b825 | Removed Cheetah from Template Engine Removed based on http://mindref.blogspot.in/2012/07/python-fastest-template.html | 2014-07-01 10:31:32 -03:00 |  | 
			
				
					| 
							
							
								 Eduardo Rolim | 90f3f7bcbb | Added entries on Template Engine Added Genshi, Mako, Cheetah and webstring. | 2014-07-01 09:59:56 -03:00 |  | 
			
				
					| 
							
							
								 Adam Groszer | 1eef1eb1d3 | added Plone | 2014-07-01 12:49:17 +02:00 |  | 
			
				
					| 
							
							
								 Adam Groszer | 13908aa275 | added ZPT and Chameleon | 2014-07-01 12:04:44 +02:00 |  | 
			
				
					| 
							
							
								 Guillermo Pascual | c4c6e669e5 | Add mamba & doublex | 2014-07-01 10:41:59 +02:00 |  | 
			
				
					| 
							
							
								 Adam Groszer | 027535e121 | added Zope Toolkit and Bluebream | 2014-07-01 09:31:32 +02:00 |  | 
			
				
					| 
							
							
								 Adam Groszer | dfbaacdacd | added ZODB | 2014-07-01 09:26:14 +02:00 |  | 
			
				
					| 
							
							
								 Adam Groszer | df57eff6a9 | added buildout | 2014-07-01 09:20:28 +02:00 |  | 
			
				
					| 
							
							
								 Adam Groszer | 0478e7dbb7 | added Winpdb | 2014-07-01 09:17:59 +02:00 |  | 
			
				
					| 
							
							
								 Shivam Bansal | 9aa9c38506 | added fuckit and tinter | 2014-07-01 12:43:26 +05:30 |  | 
			
				
					| 
							
							
								 Zach | ef410f9d32 | add webpy on web framework | 2014-06-30 21:10:41 -07:00 |  | 
			
				
					| 
							
							
								 Zach | 201558d1f5 | add you-get and coursera on video | 2014-06-30 21:07:16 -07:00 |  | 
			
				
					| 
							
							
								 Vinta | 12478e0128 | remove duplicate | 2014-07-01 11:54:41 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | ad828b7e24 | add two books | 2014-07-01 11:52:41 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | fac3c79710 | add Foreign Function Interface section | 2014-07-01 11:47:26 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | be856f2f8a | Merge pull request #16 from johngoodleaf/master Adding PonyORM to ORM section | 2014-07-01 11:30:58 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | 88aa544ad8 | Merge pull request #15 from henriquebastos/patch-1 Adding Unipath and Name Parser to the list | 2014-07-01 11:30:49 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | eaeb9edfe7 | Merge remote-tracking branch 'morgotth/master' Conflicts:
	README.md
Fixed | 2014-07-01 11:29:50 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | 37a2821129 | Merge pull request #12 from vndmtrx/master Added entries on Docs and Web Frameworks | 2014-07-01 11:26:07 +08:00 |  | 
			
				
					| 
							
							
								 Vinta | ddb384b819 | Merge pull request #11 from melignus/melignus-high-performance Melignus high performance | 2014-07-01 11:19:01 +08:00 |  | 
			
				
					| 
							
							
								 John Goodleaf | 666ca91def | Adding PonyORM to ORM section | 2014-06-30 18:51:00 -07:00 |  | 
			
				
					| 
							
							
								 Henrique Bastos | 19c76621a9 | Adding Unipath and Name Parser to the list | 2014-06-30 20:22:42 -03:00 |  | 
			
				
					| 
							
							
								 Eduardo Rolim | ee93b3b8f4 | Added Python-Markdown on Documentation | 2014-06-30 17:08:58 -03:00 |  | 
			
				
					| 
							
							
								 Eduardo Rolim | 8d206ddcf7 | Added reStructuredText on Documentation | 2014-06-30 17:06:49 -03:00 |  | 
			
				
					| 
							
							
								 Morgotth | 1f5ef7759c | Adding MkDocs in Documentation section. | 2014-06-30 21:55:43 +02:00 |  | 
			
				
					| 
							
							
								 Eduardo Rolim | 2bea0671f0 | Sanitizing meaningful spaces Replacing misleading tabs with 4-spaces indentation (as as in the rest of file). | 2014-06-30 15:29:16 -03:00 |  | 
			
				
					| 
							
							
								 Eduardo Rolim | 8df43e246b | Added entries on Web Development Frameworks Added TurboGears, Grok and CherryPy. | 2014-06-30 15:06:49 -03:00 |  | 
			
				
					| 
							
							
								 nbuihner | 8a486f3ca4 | Spelling | 2014-06-30 11:03:25 -07:00 |  | 
			
				
					| 
							
							
								 nbuihner | cb5264dea1 | Added High Performance category | 2014-06-30 11:00:28 -07:00 |  | 
			
				
					| 
							
							
								 Vinta | 985b8ea0ca | Merge pull request #9 from melignus/melignus-additions Added games category, a few gui modules, a few science modules. | 2014-07-01 01:47:15 +08:00 |  | 
			
				
					| 
							
							
								 nbuihner | a949a5e189 | Rolled back a bork in the merge. | 2014-06-30 10:42:08 -07:00 |  | 
			
				
					| 
							
							
								 nbuihner | 76093a9963 | Merge branch 'master' into melignus-additions Conflicts:
	README.md | 2014-06-30 10:38:43 -07:00 |  | 
			
				
					| 
							
							
								 Vinta | 448fa76803 | Merge pull request #8 from ellisonleao/patch-2 Add game development section and pyglet to GUI section | 2014-07-01 01:24:05 +08:00 |  | 
			
				
					| 
							
							
								 nbuihner | 4fe194ea8f | Added games category, a few gui modules, a few science modules. | 2014-06-30 10:17:43 -07:00 |  | 
			
				
					| 
							
							
								 Ellison Leão | c03720e214 | Merge branch 'master' into patch-2 | 2014-06-30 14:04:43 -03:00 |  | 
			
				
					| 
							
							
								 Vinta | 33adea70e8 | ok, remove the gif | 2014-07-01 01:04:03 +08:00 |  | 
			
				
					| 
							
							
								 Ellison Leão | 5bb46200dc | Add pyglet on GUI section | 2014-06-30 14:00:45 -03:00 |  | 
			
				
					| 
							
							
								 Ellison Leão | 956885ad2a | Add Game Development section | 2014-06-30 13:57:49 -03:00 |  | 
			
				
					| 
							
							
								 Vinta | b1f14337bf | add ipdb to Debugging Tools section | 2014-07-01 00:57:39 +08:00 |  |