Excelente post de El Espíritu de los Cínicos: Link.
Después de que Dani Granatta inventara al Arjonio como forma de justificar de todos los males (poéticos), fue inevitable dejar constancia académica de su existencia.
Colección de recortes y cosas útiles, simpáticas, interesantes(o las 3!) de Matías Herranz.
origin
, since this
name is familiar to all Git users.origin
prematurely. In the figure above, there are subteams of Alice and Bob,
Alice and David, and Clair and David.bob
, pointing to Bob’s repository, and vice versa.master
develop
master
branch at origin
should be familiar to every Git user. Parallel
to the master
branch, another branch exists called develop
.origin/master
to be the main branch where the source code of
HEAD
always reflects a production-ready state.origin/develop
to be the main branch where the source code of
HEAD
always reflects a state with the latest delivered development changes
for the next release. Some would call this the “integration branch”. This is
where any automatic nightly builds are built from.develop
branch reaches a stable point and is
ready to be released, all of the changes should be merged back into master
somehow and then tagged with a release number. How this is done in detail will
be discussed further on.master
, this is a new
production release by definition. We tend to be very strict at this, so that
theoretically, we could use a Git hook script to automatically build and
roll-out our software to our production servers everytime there was a commit on
master
.master
and develop
, our development model uses a
variety of supporting branches to aid parallel development between team
members, ease tracking of features, prepare for production releases and to
assist in quickly fixing live production problems. Unlike the main branches,
these branches always have a limited life time, since they will be removed
eventually.develop
develop
master
, develop
, release-*
,
or hotfix-*
develop
(to definitely add the new feature to the
upcoming release) or discarded (in case of a disappointing experiment).origin
.develop
branch.$ git checkout -b myfeature develop
Switched to a new branch "myfeature"
develop
branch definitely add them
to the upcoming release:$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff myfeature
Updating ea1b82a..05e9557
(Summary of changes)
$ git branch -d myfeature
Deleted branch myfeature (was 05e9557).
$ git push origin develop
The --no-ff
flag causes the merge to always create a new commit object, even
if the merge could be performed with a fast-forward. This avoids losing
information about the historical existence of a feature branch and groups
together all commits that together added the feature. Compare:--no-ff
flag was used.--no-ff
the default behaviour
of git merge
yet, but it really should be.develop
develop
and master
release-*
develop
branch is cleared to receive features for the next big release.develop
is when
develop (almost) reflects the desired state of the new release. At least all
features that are targeted for the release-to-be-built must be merged in to
develop
at this point in time. All features targeted at future releases may
not—they must wait until after the release branch is branched off.develop
branch reflected changes for the “next release”, but it is unclear whether that
“next release” will eventually become 0.3 or 1.0, until the release branch is
started. That decision is made on the start of the release branch and is
carried out by the project’s rules on version number bumping.develop
branch. For example, say
version 1.1.5 is the current production release and we have a big release
coming up. The state of develop
is ready for the “next release” and we have
decided that this will become version 1.2 (rather than 1.1.6 or 2.0). So we
branch off and give the release branch a name reflecting the new version
number:$ git checkout -b release-1.2 develop
Switched to a new branch "release-1.2"
$ ./bump-version.sh 1.2
Files modified successfully, version bumped to 1.2.
$ git commit -a -m "Bumped version number to 1.2"
[release-1.2 74d9424] Bumped version number to 1.2
1 files changed, 1 insertions(+), 1 deletions(-)
After creating a new branch and switching to it, we bump the version number.
Here, bump-version.sh
is a fictional shell script that changes some files
in the working copy to reflect the new version. (This can of course be a manual
change—the point being that some files change.) Then, the bumped version
number is committed.develop
branch). Adding large new features here is
strictly prohibited. They must be merged into develop
, and therefore, wait
for the next big release.master
(since every commit on master
is a new release by definition,
remember). Next, that commit on master
must be tagged for easy future
reference to this historical version. Finally, the changes made on the release
branch need to be merged back into develop
, so that future releases also
contain these bug fixes.$ git checkout master
Switched to branch 'master'
$ git merge --no-ff release-1.2
Merge made by recursive.
(Summary of changes)
$ git tag -a 1.2
The release is now done, and tagged for future reference.-s
or -u
flags to sign
your tag cryptographically.develop
, though. In Git:$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff release-1.2
Merge made by recursive.
(Summary of changes)
This step may well lead to a merge conflict (probably even, since we have
changed the version number). If so, fix it and commit.$ git branch -d release-1.2
Deleted branch release-1.2 (was ff452fe).
master
develop
and master
hotfix-*
develop
branch) can
continue, while another person is preparing a quick production fix.master
branch. For example, say
version 1.2 is the current production release running live and causing troubles
due to a severe bug. But changes on develop
are yet unstable. We may then
branch off a hotfix branch and start fixing the problem:$ git checkout -b hotfix-1.2.1 master
Switched to a new branch "hotfix-1.2.1"
$ ./bump-version.sh 1.2.1
Files modified successfully, version bumped to 1.2.1.
$ git commit -a -m "Bumped version number to 1.2.1"
[hotfix-1.2.1 41e61bb] Bumped version number to 1.2.1
1 files changed, 1 insertions(+), 1 deletions(-)
Don’t forget to bump the version number after branching off!$ git commit -m "Fixed severe production problem"
[hotfix-1.2.1 abbe5d6] Fixed severe production problem
5 files changed, 32 insertions(+), 17 deletions(-)
Finishing a hotfix branchmaster
, but also needs
to be merged back into develop
, in order to safeguard that the bugfix is
included in the next release as well. This is completely similar to how release
branches are finished.master
and tag the release.
$ git checkout master
Switched to branch 'master'
$ git merge --no-ff hotfix-1.2.1
Merge made by recursive.
(Summary of changes)
$ git tag -a 1.2.1
-s
or -u
flags to sign
your tag cryptographically.develop
, too:
$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff hotfix-1.2.1
Merge made by recursive.
(Summary of changes)
develop
. Back-merging the bugfix into the release branch will
eventually result in the bugfix being merged into develop
too, when the
release branch is finished. (If work in develop
immediately requires this
bugfix and cannot wait for the release branch to be finished, you may safely
merge the bugfix into develop
now already as well.)
$ git branch -d hotfix-1.2.1
Deleted branch hotfix-1.2.1 (was abbe5d6).
Deleting Remote Branches
Suppose you’re done with a remote branch — say, you and your collaborators are finished with a feature and have merged it into your remote’s master branch (or whatever branch your stable codeline is in). You can delete a remote branch using the rather obtuse syntax git push [remotename] :[branch]. If you want to delete your serverfix branch from the server, you run the following:
Boom. No more branch on your server. You may want to dog-ear this page, because you’ll need that command, and you’ll likely forget the syntax. A way to remember this command is by recalling the git push [remotename] [localbranch]:[remotebranch] syntax that we went over a bit earlier. If you leave off the [localbranch] portion, then you’re basically saying, “Take nothing on my side and make it be [remotebranch].”$ git push origin :serverfix To git@github.com:schacon/simplegit.git - [deleted] serverfix
$ /usr/bin/ruby -e "$(curl -fsSL https://raw.github.com/gist/323731)"
Now you are ready to go!$ brew install gtkInstall PyGTK:
$ python
>>> import pygtk
http://www.blogger.com/language.gShort post :)
find . -iname "Thumbs.db"And just run the following command in the base folder from where to erase them:
find . -iname "Thumbs.db" -delete
----------------------------------------------------------------------
Ran 414 tests in 232.764s
OK
Destroying test database for alias 'default' ('test_cpi_mrp3')...
Desiderata (del latín desiderata "cosas deseadas", plural de desideratum) es un poema muy conocido sobre la búsqueda de la felicidad en la vida. Sus derechos de autor son del año 1927 y pertenecen a Max Ehrmann. Desiderata fue publicado en 1948 (después de la muerte de su autor) en una colección de poemas titulada Desiderata of Happiness, recopilados por la esposa de Ehrmann.Fuente: http://es.wikipedia.org/wiki/Desiderata
En la década del 60 circuló sin la atribución a Ehrmann, a veces con la afirmación de que había sido encontrado en la iglesia St. Paul de Baltimore, en Maryland, Estados Unidos. También se decía que había sido escrito en 1692 (año de la fundación de la iglesia). Sin embargo, esta poesía ha mantenido el sello de Ehrmann en algunas de sus ediciones.
[matias@MacBookPro]:~ $ sudo brew updateThe fix is easy. Luckily. Goes like this:
Password:
remote: Counting objects: 588, done.
remote: Compressing objects: 100% (253/253), done.
remote: Total 455 (delta 348), reused 298 (delta 193)
Receiving objects: 100% (455/455), 52.32 KiB, done.
Resolving deltas: 100% (348/348), completed with 124 local objects.
From http://github.com/mxcl/homebrew
* branch master -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
.gitignore
Library/Aliases/0mq
Library/Aliases/4store
(.... lots of lines ....)
Library/Formula/android-sdk.rb
Library/Formula/angband.rb
Library/Formula/ansifilter.rb
Library/Formula/antiword.rb
Library/Formula/antlr.rb
Library/Formula
Aborting
Error: Failed while executing git pull origin master
$ sudo chown -R `whoami` /usr/local
$ cd /usr/local
$ git reset --hard origin/master
$ cd
[matias@MacBookPro]:local (git: master ?) $ brew update
From http://github.com/mxcl/homebrew
3dc7fe2..09ebe32 master -> origin/master
Updated Homebrew from 3dc7fe29 to 09ebe32c.
==> New formulae
aespipe fuse4x fuse4x-kext ntfs-3g parmetis s3fs scotch sshfs
==> Removed formulae
unix2dos
==> Updated formulae
(.... lots of stuff here ....)
$ pkg-config --atleast-version=1.8.10 cairo
$ echo $?
1
$ brew install cairo
$ pkg-config --atleast-version=1.8.10 cairo
$ echo $?
1
$ export PKG_CONFIG_PATH=Note: In my case, the path is: /usr/local/Cellar/cairo/1.10.2/lib/pkgconfig/
$ pkg-config --atleast-version=1.8.10 cairo
$ echo $?
0
$ ./waf configure
./set_options
./init
./configure
Checking for program gcc or cc : /usr/bin/gcc
Checking for program cpp : /usr/bin/cpp
Checking for program ar : /usr/bin/ar
Checking for program ranlib : /usr/bin/ranlib
Checking for gcc : ok
Checking for program python : /Users/matias/Dev/CPI/Env/bin/python
Checking for Python version >= 2.6.0 : ok 2.6.1
Checking for library python2.6 : yes
Checking for program python2.6-config : /usr/local/bin/python2.6-config
Checking for header Python.h : yes
Checking for cairo >= 1.8.10 : yes
'configure' finished successfully (0.416s)
./shutdown
$ ./waf build
$ ./waf install6. Update your PYTHONPATH(you may want to add this line at the bottom of your ~/.profile):
export PYTHONPATH=/usr/local/lib/python2.6/site-packages/:$PYTHONPATH
$ pythonHappiness!
Python 2.6.1 (r261:67515, Jun 24 2010, 21:47:49)
[GCC 4.2.1 (Apple Inc. build 5646)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> import cairo
>>> cairo.version
'1.8.10'
(Env)matias@[13:51:34]:pycairo-1.8.10 $ ./waf configure ./set_options
./init(Env)matias@[13:52:07]:pycairo-1.8.10 $ ./waf build
./configure
Checking for program gcc or cc : /usr/bin/gcc
Checking for program cpp : /usr/bin/cpp
Checking for program ar : /usr/bin/ar
Checking for program ranlib : /usr/bin/ranlib
Checking for gcc : ok
Checking for program python : /Users/matias/Dev/CPI/Env/bin/python
Checking for Python version >= 2.6.0 : ok 2.6.1
Checking for library python2.6 : yes
Checking for program python2.6-config : /usr/local/bin/python2.6-config
Checking for header Python.h : yes
Checking for cairo >= 1.8.10 : yes
'configure' finished successfully (0.416s)
./shutdown
./set_options(Env)matias@[14:05:51]:pycairo-1.8.10 $ ./waf install
./init
Waf: Entering directory `/Users/matias/Dev/CPI/Stuff/pycairo-build'
./build
src/build
[1/9] cc: src/cairomodule.c -> ../pycairo-build/default/src/cairomodule_2.o
[2/9] cc: src/context.c -> ../pycairo-build/default/src/context_2.o
[3/9] cc: src/font.c -> ../pycairo-build/default/src/font_2.o
[4/9] cc: src/path.c -> ../pycairo-build/default/src/path_2.o
[5/9] cc: src/pattern.c -> ../pycairo-build/default/src/pattern_2.o
[6/9] cc: src/matrix.c -> ../pycairo-build/default/src/matrix_2.o
[7/9] cc: src/surface.c -> ../pycairo-build/default/src/surface_2.o
[8/9] copy: pycairo.pc.in -> ../pycairo-build/default/pycairo.pc
In file included from /usr/X11/include/X11/Xlib.h:64,
from /usr/local/Cellar/cairo/1.10.2/include/cairo/cairo-xlib.h:44,
from ../pycairo-1.8.10/src/surface.c:1360:
/usr/X11/include/X11/Xosdefs.h:145:1: warning: "_DARWIN_C_SOURCE" redefined
In file included from /System/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6/Python.h:8,
from ../pycairo-1.8.10/src/surface.c:32:
/System/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6/pyconfig.h:1075:1: warning: this is the location of the previous definition
[9/9] cc_link: ../pycairo-build/default/src/cairomodule_2.o ../pycairo-build/default/src/context_2.o ../pycairo-build/default/src/font_2.o ../pycairo-build/default/src/path_2.o ../pycairo-build/default/src/pattern_2.o ../pycairo-build/default/src/matrix_2.o ../pycairo-build/default/src/surface_2.o -> ../pycairo-build/default/src/_cairo.so
Waf: Leaving directory `/Users/matias/Dev/CPI/Stuff/pycairo-build'
'build' finished successfully (0.764s)
./shutdown
./set_options
./init
Waf: Entering directory `/Users/matias/Dev/CPI/Stuff/pycairo-build'
./build
src/build
* installing src/pycairo.h as /usr/local/include/pycairo/pycairo.h
* installing /Users/matias/Dev/CPI/Stuff/pycairo-build/default/src/_cairo.so as /usr/local/lib/python2.6/site-packages/cairo/_cairo.so
* installing /Users/matias/Dev/CPI/Stuff/pycairo-build/default/pycairo.pc as /usr/local/lib/pkgconfig/pycairo.pc
Waf: Leaving directory `/Users/matias/Dev/CPI/Stuff/pycairo-build'
* installing src/__init__.py as /usr/local/lib/python2.6/site-packages/cairo/__init__.py
* byte compiling '/usr/local/lib/python2.6/site-packages/cairo/__init__.py'
'install' finished successfully (0.832s)
./shutdown
Desde el 20.000 a. de C. al 1 d. de C. | ||
Fechas | Inventos y datos relacionados | Eventos |
20.000 aC 18.000 aC 18.000 aC | Agujas de hueso Pinceles Cabañas de hueso de mamut | Se realizan las primeras herramientas de piedra |
13.000 aC 12.000 aC 10.500 aC | Arpones Cestería en mimbre Vasijas de arcilla | Se comienzan a domesticar perros (11.000) |
10.000 aC 8.000 aC 7.500 aC 6.500 aC 6.000 aC 5.500 aC 5.000 aC | Redes de pesca Peine Canoas Fundición de cobre Ladrillo Rueda Balanza | Extinción de mamuts de pelo(10.000) Primeras cosechas en Medio Oriente (8.000) |
3.500 a 4.000 aC 3.500 aC 3.300 aC 3.000 aC 1.747 aC 1.500 aC 600 aC Siglo III aC 150 aC | Embarcaciones de vela Arado Escritura Cuneiforme Ábaco Calendario Fundición del Hierro Monedas La palanca El tornillo sin fin El tornillo elevador de agua La rueda dentada La balanza hidrostática Los espejos ustorios Sismoscopio | Alrededor del 3.500 comienza la Edad de Bronce. Arquímedes (287-212 a.C.), notable matemático e inventor griego, nacido en Siracusa, Sicilia, y educado en Alejandría, Egipto, se anticipó a su época con investigaciones e inventos. |
Año 1 al 1499 d. de C. | ||
Fechas | Inventos | Eventos |
50 105 124 200 a 300 350 400 a 500 | Herradura Papel Cúpula Carro con ruedas Estribos Astrolabio | 0-33 Vida y Pasión de Jesucristo. 300 - El Cristianismo se ha difundido en el Imperio Romano Fines del Siglo V: Caída del Imperio Romano de Occidente (476). Comienzo de la Edad Media. |
650 800 a 900 800 a 900 868 950 999 800 a 1.100 | Molino de Viento Papel Moneda Pólvora Impresión de libros Arado de ruedas Cristales coloreados en ventanas de Inglaterra Partituras | Pleno desarrollo precolombino de las civilizaciones aborígenes americanas, especialmente Mayas, Aztecas, Chibchas e Incas. En el S. X aparece la herradura para caballos y un arnés |
1.000 1.000 1.100 1.105 1.118 1.121 1.200 1.232 1.257 1.268 1.272 1.280 1.298 1.400 1.420 1.450 Siglo XV | Lentes Cámara oscura Brújula magnética Primer molino de viento en Francia Cañón (Usado por los moros) Clavecín Timón de popa Globos de aire caliente (China) Espejos cóncavos Anteojos Máquina de bobinas de seda en Bolonia Reloj mecánico Rueda de hilar Pinturas al óleo Velocípedo Imprenta de tipos móviles Laúd | Hacia 1140- "Mio Cid" - Dos juglares de Medinacelli componen el primer texto en lengua romance castellano. 1271. Parte de Venecia Marco Polo rumbo a China. En el S. XIV se perfecciona la fabricación del vidrio y se inventa el telar a pedal. 1492 - Descubrimiento de América. |
Año 1500 a 1699 | ||
Fechas | Inventos | Eventos |
1.500 1.500 | Reloj (1.500) Puntilla (1.500) | 1522 - Sebastián Elcano completa el viaje alrededor del mundo. 1530- Comienza el comercio de esclavos |
1.565 1.581 1.569 1.589 1.589 1.590 1.593 | Lápiz Péndulo Mapa en proyección Telar Inodoro Microscopio compuesto Termómetro de agua | 1589: Sir John Harrington (GB) inventa el inodoro con depósito, pero pasó mucho tiempo antes de imponerse, y se siguieron usando bacines y retretes con agujeros hacia pozo o foso. |
1.609 1.620 1.620 1.640 1.642 | Telescopio refractor Diligencia Submarino Bayoneta Calculadora de Pascal | 1605 / 1615: Cervantes publica "El Ingenioso Hidalgo Don Quijote de La Mancha" 1620: Arriba el "Maryflower" a América del Norte. |
1.657 1.665 1.668 1.672 1.687 | Reloj de péndulo Microscopio mejorado Telescopio reflector Bomba neumática Higrómetro | Halley descubre el cometa denominado con su nombre (1682) |
Año 1700 a 1899 | ||
Fechas | Inventos | Eventos |
1.709 1.710 1.712 1.714 1.731 1.733 1.740 1.740 1.742 1.745 | Piano Termómetro de alcohol Máquina de vapor Newcomen Termómetro de mercurio Octante Lanzadera automática Estufa Franklin Imprenta en colores Escala centígrada Condensador eléctrico | Fundación en 1.724, de la Academia de Ciencias de Rusia |
1.752 1.757 1.761 1.763 1.769 1.776 1.782 1.783 1.784 1.785 1.790 1.795 1.796 1.796 | Pararrayos Sextante Cronómetro Reflectores Parabólicos Automóvil de vapor Volante Máquina de vapor Watt Globo de aire caliente Lámpara de aceite, con mecha hueca Electróforo Hélice Sistema métrico Vacuna Litografías | 1.789: Revolución Francesa Termina la Edad Moderna y comienza la Edad Contemporánea. |
1.800 1.801 1.801 1.801 1.802 1.803 1.805 1.816 1.821 1.827 1.830 1.831 1.834 1.837 1.837 1.838 1.839 1.840 1.840 1.842 1.846 1.846 1.846 1.848 | Martillo Pilón Pila eléctrica Electróforo Endiómetro Locomotora de Vapor Acumulador eléctrico Telar Jacquard Lámpara de seguridad para mineros Termoelectricidad Fósforos Cortadora de césped Dínamo eléctrica Cosechadora Telégrafo eléctrico Alfabeto Morse Estereoscopio Bicicleta Estampilla de Correos Buques con casco de hierro Reloj eléctrico Anestésicos Saxofón Prensa rotativa Cerradura de seguridad | Napoleón es derrotado en Waterloo (1.815) |
1.851 1.860 1.860 1.870 1.876 1.876 1.877 1.877 1.880 1.884 1.885 1.885 1.888 1.889 1.890 1.890 1.894 1.894 1.897 1.897 1.899 | Cámara de placas Linóleo Esquiladora Máquina de escribir Teléfono Frigorífico Fonógrafo Motor de cuatro tiempos Bombita eléctrica Generador de turbina de vapor Automóvil Bicicleta de pedales Gramófono Ascensor eléctrico Rayos X El tubo de Crookes Radio Primer periscopio Motor Diesel Motor eléctrico compacto | El motor de cuatro tiempos inventado por Otto (Al. 1877) permitió la invención del automóvil Luis Pasteur, en 1881 comenzó sus experimentos contra la rabia. |
Año 1900 a la actualidad | ||
Fechas | Inventos | Eventos |
1.900 1.900 1.901 1.902 1.903 1.903 1.903 1.903 1.903 1.906 1.907 | El dirigible rígido Zeppelin Tractor Mecano Frenos de disco Cuchilla de seguridad Máquina de hacer botellas Electrocardiograma Cinturón de Seguridad Osito de peluche Lámpara Termoiónica Lavarropas | En 1901, Marconi emite un mensaje de radio a través del Océano Atlántico. Se abre el Canal de Panamá en 1904 |
1.910 1.911 1.913 1.913 1.913 1.914 1.914 1.916 | Se funda la Sociedad de Inventores Argentinos. Modelo nuclear del átomo Acero inoxidable Cadena de montaje Heladera Eléctrica Cremallera Semáforos luminosos Limpiaparabrisas | Comienza la Primera Guerra Mundial (1.914). Albert Einstein desarrolla y enuncia su teoría de la Relatividad (1.915). |
1.920 1.921 1.922 1.925 1.926 1.927 1.927 1.928 1.929 | Secador de Pelo Autopistas Se funda el Círculo Argentino de Inventores. Contador Geiger Televisor Tostadora Caucho sintético Antibióticos Ciclotrón | Se engrandece la figura del Mahatma Gandhi, en su posición contra el gobierno británico en la India. |
1.930 1.931 1.932 1.933 1.933 1.934 1.935 1.938 1.938 1.938 | Motor a Reacción Microscopio Electrónico Guitarra Eléctrica Grabaciones Estéreo Polietileno Nylon Radar Café Instantáneo Fotocopiadora Bolígrafo | 1936: Guerra Civil Española 1939: Comienza la Segunda Guerra Mundial |
1.941 1.942 1.942 1.943 1.946 1.946 1.946 1.947 1.948 1.949 | Aerosoles Reactor Nuclear Equipo de Inmersión Turbina de reacción para aviones Horno de Microondas Calculadora electrónica Computadora Transistor Long Play - Disco de Larga Duración Neumáticos Radiales | La Bomba atómica destruye Hiroshima y Nagashaki, Japón, en 1.945 |
1.950 1.954 1.954 1.955 1.956 1.956 1.957 1.958 1.959 1.959 | Tarjeta de Crédito Central Nuclear Radio a transistores Plancha de vapor Velcro Video Cámara Satélite Espacial Aerodeslizador Chip de Silicio Lycra | Mediante arduas investigaciones, se descubre la estructura del ADN (1.953). Realizan el ascenso al Everest, en 1.953, Hillary y Tenzing |
1.960 1.962 1.962 1.963 1.964 1.969 | Teflón Robot Industrial Satélite de Comunicaciones Video Casettera Procesador de Textos Avión Jumbo | El hombre posa su pie en la luna. En 1.969 los astronautas estadounidenses llegan a la Luna. |
1.971 1.972 1.972 1.973 1.974 1.978 1.979 1.979 | Reloj Digital Escáners Rayos X Video juegos domésticos Protocolo de Internet (IP) y Protocolo de Control de Transmisión (TCP) Códigos de Barras Computadora Personal Walkman Catalizadores para automotores | Nace el primer bebe de probeta, en 1978. |
1.980 1.981 1.981 1.982 1.982 1.982 | Cubo de Rubik Transbordador Espacial Papeles autoadhesivos Tarjeta inteligente Corazón Artificial Discos Compactos | Explosión del reactor nuclear de Chernobyl en 1986. Cae el Muro de Berlín en 1989 |
1.990 1.990 1.990 1.990 1.991 1.993 1.994 1.995 1.999 2.000 | Realidad Virtual Fusión Nuclear Identificador de voz Se funda la Asociación Argentina de Inventores y la Escuela Argentina de Inventores. Videófono Se realiza en Buenos Aires el Primer Congreso Iberoamericano de Inventores Se celebra en Argentina el 50° Aniversario de la invención del bolígrafo. El Correo Argentino emite estampillas conmemorativas, en honor de Biro, y otros inventores argentinos destacados: Pescara, Cristiani y Finochietto. Internet: se populariza el uso de redes con protocolos TCP/IP Se crea en Argentina la Fundación Biro, en el centenario del nacimiento de Ladislao José Biro. Se organiza en Buenos Aires el Simposio Internacional de Inventores (WIPO-IFIA Symposium), por primera vez en el hemisferio Sur | Invasión a Kuwuait por parte de Irak en 1990. Se agilizan las comunicaciones instantáneas y se afianza el concepto de globalización |
Buscando algunos inventos por año en que se inventaron, dí con este sitio, que me resultó más que interesante. Siguiendo mi recorrido por el sitio, encontré una sección dedicada a recopilar algunos de los inventos que se hicieron en Argentina y/o por argentinos/as. Acá van algunos:
|