labofsahil/github-event-dataset-2012 huggingface dataset:
modify to
use git log --no-merges --fist-parent
optionalize to option
delete branch option
Complete visualHUD package for demo purposes
Use different mongo-hadoop version
Get rid of the deprecation warning in argparse
Update README to reflect index.html changes
some clean ups to domain checking
dnsimple

now I could consider playing with the DNSimple APIs
initial import of python2-wtforms
update python2-wtforms
update burpsuite
Use CPPFLAGS instead of using AX_DEFINE_DIR
biosemi: Add pass option in its test
Fix test on uninitialized data in optimize_inbufgrp
FO: remove trailing whitespace
FO: add coding header to Framework
FO: minor docstring nitpicks

Use a proper sentence (with capitalization and punctuation) in the first lines
of docstrings and in multiline parameter descriptions.
FO: spell correct docstrings
Merge pull request #1 from esc/review/nchiapol/master-PR65

Review/nchiapol/master pr65
Okay so APIs with extern 'C' { } failed to parse because {} blocks were completely skipped. It's fixed naow. zmq.h parses nicely :)
^ Australian locale file
Calling update activity from contextual menu
Merging...
Merging...
Merge branch 'master' of https://github.com/necronet/XTrade
Merge branch 'master' of https://github.com/necronet/XTrade
Merge branch 'master' of https://github.com/necronet/XTrade
Adding favorite button on trader list and also in the table for being saved
Fixing merge conflicts
Updating contacts
Put again the inflate of menu in trader list
consolidated time table
GTA04: add twl4030 'vibra' input device.

This create a /dev/input/eventXX device which supports a 'rumble'
force-feedback effect.

Signed-off-by: NeilBrown <neilb@suse.de>
update for hpfog 0.0.16
source/netflow: add paren for enforcement of truth values
Add stub for reading binary files.
add factory girl gem in gemfile
herp derp forgot bg
add result.jsp

Signed-off-by: nextspeed-pc <nextspeed01@gmail.com>
added words and changed titles to title case
Merge branch 'andy' of https://github.com/nickcho/hackgen into andy
Consertando links do frame e colaboradores.
attachment combo box selection event
Don't rely on BASH being installed at /bin/bash
Use ruby-1.8.7-p358 instead of the system installed debian version
chris changes his mind too much :(
Google API 403 Error handling
問題募集中
wrong place for readme
copy, line_angle, rotate, scale icons
move some scripts to fun/ subdir
add description, update committer name
add description
add xresources to gconf converter
Проверка на то, что программист еще работает на проекте
PHPUnit skeleton generator
Domain Name "getter" for Command Lines Controller
Show available domains in the scripts help message
Show available domains in the scripts help message
UT domain definition for load settings from domains.config
PHP sql parser for querys validation
Merge branch 'master' into devel
Fix to pending translations estimates on translation tool
ExecuteSingleController returns an array if you are calling a JSON controller.
Updated GeoIP to last version
Modifying the origin of the Sphinx connection params
Modifying the origin of the Sphinx connection params (fixing line endings)
Improving Smarty genurl plugin
Merge branch 'master' into devel
Improving Smarty genurl plugin (removed notices)
Method to easily get a command in CL controllers
Method to easily get a command in CL controllers
* Now you may use Controller::getParsedParam instead
Improving Smarty genurl plugin
* Fixed a conflict in params array and added a warning in the plugin documentation
NEW: Profiles availability in sphinx.config
Autoaprove set to true.
implemented yphysics
Added initial music app
Fix TLS unit test.
1 から 4 まで解いた
add forum.kinoweekend.org - askbot.org
Messe H.9 : génération Makefile
Messe H.9 : fichiers principaux
handle xtest
Revert "target: remove unused working area 'user' field"

This reverts commit 63a23e6fc862b94f00e0833ab474bd02901a019f, which
causes problems with various flash drivers (i.e. LPC1xxx/LPC2xxx)
due to working area handling.

Change-Id: I291ff2ac4f1eef7ecd553d0eb8895b790beb38c3
Signed-off-by: Freddie Chopin <freddie.chopin@gmail.com>
Reviewed-on: http://openocd.zylin.com/872
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
ftdi: incorrectly using output register for direction

fix a simple copy/paste bug.

Change-Id: I5caaa4d16d30f26a453bd6a00c95261fd6e716c5
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/873
Tested-by: jenkins
Fixed adding a collection
Додана матриця координат розташування кораблів на полі

/*TO DO*/
       /* При перетягування корабля з однієї позиції на іншу*/
       /* встановлювати координати старої позиції в нуль "0"  */
sb
Sb fixes
фікси
фікси 2
fixes 3
added solution for spotify lottery challenge
Merge github.com:nxvl/challenges
testing assets
merge
fixes and new unicorn
update zshrc to use rvm
some update
some text to admin home
Adding changes to CHANGELOG file. Deleting rakefile.old
Dont use composer if http url provided. Fixes GH-108.
reduce the amount of loop and use native functions

Closes GH-111

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
Fix Acl cache. acl cache for the group "Public" wasn't removed
add submodule Plugin Search
load Plugin Search in Extensions
add element search & call it in Common/admin_index
use Search Plugin in Users
Fixing logout link broken since user refactored into plugin.
Change MyISAM to InnoDB for Mysql
Added unit tests for the current Layout::filterElements method
Fixed the Filter elements regex to allow equals sign in attribute values - closes #133
Added a Javascript check in the default theme to prevent double form submission - closes #284
use Nodes with Search Plugin
Merge branch '1.5-search' of git://github.com/kahitam/croogo into 1.5

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
Merge branch '1.5-double-click' of git://github.com/occitech/croogo into 1.5

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
Merge branch '1.5-fix-logout-link' of git://github.com/occitech/croogo into 1.5

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
Merge branch '1.5-MyIsamToInnoDB' of git://github.com/occitech/croogo into 1.5

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
Merge branch '1.5-filter-elements' of git://github.com/occitech/croogo into 1.5

Signed-off-by: Rachman Chavik <rchavik@xintesa.com>
fix: $url can also be a string
Update View/Attachments/admin_browse.ctp

Allow the title and description to pass to tinyMCE
Added support for multiple parameter groups in rewrite definitions, added simple Numeric.plus rewrite
Added more Numeric rewrites
Run apt-get with -y
Ajout de l'icon-box

Signed-off-by: Julien Sanchez <sumbobyboys@gmail.com>
Merge pull request #12 from oddshocks/develop

added Prezi link and demo code
Added oddshocks lightning talk to the list.
Added link to Twisted Prezi
fix owner for dotfiles
Added goto-line action.
hide_enemys
Honouring http_no_proxy to complement http_proxy for apache httpcomponents client compatible libraries
Pushing auth checks to Authorization
Merge branch 'master' of https://github.com/omegaup/omegaup
Agregando El proyecto android basico
Corrigiendo problemas de el sistema MapUs
Correct the symbol :iri in the migrations
Seems repo_branch is normalized
fix gs in About
afs: Handle afs_AllocDCache errors

Do not panic if afs_AllocDCache encounters an error and returns NULL.
Instead, go into the normal retry loop that occurs if we couldn't free
up any more free/discard dcache entries.

Change-Id: Ia165e0b5f5ef37e05942c795955d75f26e4ea7d3
Reviewed-on: http://gerrit.openafs.org/8405
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Windows: disable short names on Win7 and 2008 R2

After listening to a presentation from Microsoft's file system
team and speaking with anti-virus vendors, it is not only safe
to disable ShortNames on non-boot volumes in Win7 and 2008 R2
but it is a definite win for performance, stability and security
of the system.

Change-Id: I706a8a17b0ae76189aeebaf254c8c70739d12f09
Reviewed-on: http://gerrit.openafs.org/7989
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
FreeBSD major version numbers are multi-character

Do not assume that there is only a single character before the dot.

Change-Id: I45169a6faa5dbeafc4f9c57deaaad96bef8de613
Reviewed-on: http://gerrit.openafs.org/8106
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Windows: Dir Enum behavior for Symlinks / MPs

Comparisons of the behavior of cmd.exe, powershell.exe, and tcc.exe
with regards to directory enumeration show that when Symlink file
information is returned that the "reparse point" data should be
reported along with whether or not the target is a directory.

For mount points, the reparse point file information should always
be returned and the type should always be directory.

The target timestamps, file sizes, etc. should never be returned.

Reviewed-on: http://gerrit.openafs.org/8170
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit dd59f6f6114a436ae86b70cd0837e97eea18dde8)

Change-Id: Ib37d60d47a313427a289603f3c6000400d881569
Reviewed-on: http://gerrit.openafs.org/8192
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: File Info Query Symlinks

For Symlinks, always set the Reparse Point attribute and
set the Directory attribute if the target is a directory.
Do not return the file attributes of the target.

Reviewed-on: http://gerrit.openafs.org/8171
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 338014a231235fe25116b09c1e8978db2db1dbb3)

Change-Id: I74d0ca1575624f46b9906f1dabc61ddff335db90
Reviewed-on: http://gerrit.openafs.org/8193
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
fileserver: check value of -cb argument

The value of the -cb argument for the fileserver was not checked correctly.
The fileserver refused to start for any number of callbacks.

Change-Id: I25fe9d81ba20d286f36999a554c94fda4ef7fb2f
Reviewed-on: http://gerrit.openafs.org/8420
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
RedHat: Avoid the DKMS escaping silliness

Depending on the version of DKMS, the current MAKE[0] variable in the
dkms.conf needs different numbers of backslashes. Commit 81a9a33e
tried to address this by changing the contents of dkms.conf depending
on whether or not we were on Fedora. However, the change occurred in
DKMS 2.2, so if someone running RHEL tries to use a newer DKMS, this
will fail.

So instead of trying to guess at the level of escaping we need, just
avoid needing to escape anything with backslashes. We can quote the
heredoc marker to avoid variable expansion inside the heredoc, we can
use a case statement instead of using backticks and local variables
and such, and we can use single quotes for the outer MAKE assignment.
With this, we should not need any backslashes when writing dkms.conf,
so we should work with any DKMS version.

Change-Id: I5484826c37da13ee383e08bbfeb473aa993e245e
Reviewed-on: http://gerrit.openafs.org/8156
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Some merging from our master branch.
Some merging from our master branch.
All jsoe files have been converted to python and are syntactically correct (though probably not logically correct)
[OC-4074] Cleaned up some formatting
search the goal: pour problem
fix #219 , improved autocomplete, appending region name
fixed #481, associate if there are listings or alerts to new user
Merge branch 'issue-github-481' into develop
minor bug fixes
addd go to page to manage items
minor fixes
Add new-style line-break patterns.
added more user tests, roles, permissions and updated fonts
Hook up Cancel button
Start using dbconfig-common

Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Gem pushed to rubygems.
Fixing dom spacing in import, and making front page stop showing at more button..
Adding the routes to handle showing things like cats,tags and posts.. Added show method too.
[scala] [anagrams] Got rid of var :)
Entered on the 9th of January,
Best regards.

P.S. For any reason, in line ms 30 it shows not eleven, but only six dots.

 - Created from SoSOL template
 - Entered on the 9th of January,
Best regards.

P.S. For any reason, in line ms 30 it shows not eleven, but only six dots.

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2012;0008' (DDB_EpiDoc_XML/sosol/sosol.2012/sosol.2012.0008.xml) to 'papyri.info/ddbdp/sb;26;16706' (DDB_EpiDoc_XML/sb/sb.26/sb.26.16706.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/sb;26;16706'
Update revisionDesc

 - Vote - AcceptText - Accept. lin3--> ἀσπάζομαί; lin8--> Ἄμμων[α] [.3] [π]ρ̣οσ̣α̣γ[ο]; lin13--> 13.- δεμίαν; lin15--> F. Reiter to Rupprecht (photo); lin16--> σωτ[ηρίας] [.3]; lin19--> ὄνομ[α] [.1]; lin30--> [.4].11; I am OK with omitting possible restorations in v, but would be OK with including them too; next voter, you? (Joshua D. Sosin)
 - Vote - AcceptText - See Sosin's comments and
l.22: ἔι => εἴ  
Verso: I don't think it is necessary to include e.g. restorations: Papyri.info is not consequent in this respect, anyways.
 (Lajos Berkes)
 - Finalized - ready (Lajos Berkes)
fixed login url bug
removed debug dump
change paper into LNCS submission format for USEC'13 submission
Merge branch 'master' of github.com:patilkr/userCSP

Conflicts:
	paper/journal/paper.pdf
Added browser-> local server connection and send over uid to browser
Merge branch 'master' of https://github.com/paulbooth/Taggr
Deprecating this
Fix build:  Use my repo's for use of strict aliasing
Set up Ctrl+Shift+f to ack for the current word, but display the word itself
Merge branch 'master' of github.com:pbyrne/dotfiles
Still messing with mermaid folowers.
Adde
Rewrote flocking to implement vision radius and
simplify the component vectors added onto the
agent's velocity. Works better now!
added limits on angle of direction change at speed
Isolate additional terms from PlayerCharacter

Issue#: CODE-1916


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18859 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Fix RowIterator
Exit nicely on feeder starvation, close #857
Upgrade Logback 1.0.9, close #860
Upgrade Jackson 2.1.2, close #861
Add jackson dep mngmt, close #861
Minor clean up
Remove useless EL cache, close #863
Update conf/vimrc.after
first try to move some functionality from Rat to the Rational role. Rather naive.
introduce Uint64, which we need for Rat (to distinguish it from FatRat)
make Rational a parametric role

hangs during setting compilation :(
WIP snapshot of Str.Numeric rewrite
Remove no-longer-needed workarounds
Refactor Str.Numeric parse failures and pos updates so that failure messages can show exact position of error in source string; wrap a few long lines in same code sections
Support :16<f.8*2**3> and :16«f.8*:4[2]**:2<1*2**2>» style radix/multiplier/exponent style numbers in Str.Numeric; add missing ASCII value comment
Merge branch 'nom' into str-numeric
Merge branch 'nom' into str-numeric
Merge branch 'nom' into str-numeric
Merge commit '2012.01' into str-numeric
Merge commit '2012.02' into str-numeric
Merge commit '2012.03' into str-numeric
Merge commit '06b4eca92a557987e9d5bbd5e3f4e575be7a6ce9' into str-numeric
Merge taking my version of Str.pm, except for including forward declaration of X::Str::Numeric
Call out a few more improvements for the announce.
Restore looking in GLOBAL in interpolated lookups. Fixes regression in require.t.
Detect duplicate symbol imports rather than silently taking the latest one.
update to latest NQP
ooh, new leap second
schedule for May
added more logging to help find wtf is going on with #9
fixing multiple team posting
Fixed highlighting of local variable definitions.
Merge branch 'master' of https://github.com/icsharpcode/ILSpy into decompiling_obfuscated_code
Optional enable folding on all blocks in braces
Don't show [AsyncStateMachine] attribute.
Fixed async/await decompilation when the GetAwaiter() is called on a value type.
Use 'stable' update
Add context menu entries for folding
Don't add seperator after first context menu entry
Adapt folding commands from SharpDevelop
Fixed disassembling fields with explicit layout.
Fixed UpdateAssemblyInfo error when git repository exists but git.exe cannot be found.
Merge pull request #344 from RKlier/contextmenu

Don't add seperator after first context menu entry
Fix #346: incorrect type inference for if statement on ref bool parameter
Merge pull request #345 from RKlier/folding

Adapt folding commands from SharpDevelop (Fix #336)
Fixed decompilation of automatic event that has attributes on the accessors.
Merge branch 'master' of https://github.com/icsharpcode/ILSpy into decompiling_obfuscated_code

Conflicts:
	ILSpy.sln
	ILSpy/ILSpy.csproj
Create 256x256 version of the ILSpy icon; and remove the useless 128x128 version from ILSpy.ico (it wasn't getting used).

Note that we are only using the small version as a window icon because WPF on Vista (without updated WIC) crashes when loading 256x256 icons.
Fix #357: Update to new Mono.Cecil version.

New version: 9848dc65a5909a8722b807c1786dd8ec02750024 from threadsafe2 branch at jbevain/cecil.
Fix compilation of BamlDecompiler.Tests
Fix #348: saving whole project does not write .baml files correctly.
Adding 5.4 DLL for 0.4.x and 0.5.x
Add st as git status
Cleaned up libFL directory
TO DO:
- Implement installation package for Dingo (install-test)
Using the correct URL #22
[artf520924] unused fields removed from ProjectInfo.java
Login page - Leave the username and password field empty and click login. The message is shown Invalid user name and password
CI for all Technologies_For Build success user unable to get system IP address through email
In Login page it should not display as enter Insight user name.
In import from svn tab,if we select Revision option it's not accepting the dot symbol.
added artifact id and group id
Merge branch 'master' of https://github.com/phresco/plugins
Merge branch 'master' of https://github.com/phresco/plugins
Update app/res/values-zh-rTW/strings.xml

fix signup_link error
Added some comments to header files.
added tests for the new PCA constructor that takes the amount of variance to retain
Removed dirty hack
Fix capybara test
New Invitation
document page preview: improvements: added proxy, background, ...

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@2122 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Fixed bug with oldest list
Added hability to use a custom STUN server
Added links about SIP over HTML
PVR client mythtv-cmyth: Reconnect control, event and database connections when they are lost

Conflicts:

	xbmc/pvrclients/mythtv-cmyth/cppmyth/MythDatabase.cpp
mythtv protocol: Reconnect control, event and database connections when they are lost
Fix: rebase error in MythDatabase::TestConnection

Conflicts:

	xbmc/pvrclients/mythtv-cmyth/cppmyth/MythDatabase.cpp
Force reconnect of MythTV event handler when a control connection is reconnected.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	xbmc/pvrclients/mythtv-cmyth/cppmyth/MythDatabase.cpp
	xbmc/pvrclients/mythtv-cmyth/cppmyth/MythEventHandler.cpp
Fix: Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
pvr: fixed GetDirectoryFromPath (was matching incomplete base folder parts)

Example: When having two subfolders 'A' and 'A - B', the recordings list shows an empty folder named ' - B'.
This patch makes sure that GetDirectoryFromPath matches complete folder names and not only parts of it.
Fix timeline start/end time after removed local time conversions
Merge pull request #578 from mikrohard/patch-4

Fix timeline start/end time after removed local time conversions
Merge pull request #575 from fetzerch/bugfix-pvr-incomplete-folders

pvr: fixed GetDirectoryFromPath (was matching incomplete base folder parts)
fixed: do not wrongly hide some ALSA HDMI devices

Currently the AESinkALSA code takes empty but existing ELD data to
always mean that the HDMI port is unconnected and hides it.

However, many HDA HDMI output devices do not properly pass ELD data,
leaving the reported ELD empty.

Therefore, only hide unconnected ports for HDA Intel and HDA NVidia,
since ELD seems to be reliable with those cards/drivers (i.e. if it
exists, it is populated, and if it is not supported, it does not exist).
fixed: build with libshairport without ao_set_metadata

Fix build with libshairport without the
AudioOutput.ao_set_metadata and AudioOutput.ao_set_metadata_coverart
members (which were added to libshairport git two months ago).

A previous commit 537bec4 had already tried to do this, but it did not
work properly and was therefore reverted in f58b70a.
Merge pull request #1190 from anssih/fix/shairport-metadata-check

fixed: build with libshairport without ao_set_metadata
Merge remote-tracking branch 'upstream-ro/master'
[AE] fixed: DTS HD core-only passthrough regression

Commit 941eae2dd ("[AE] fixed: passthrough of LE DTS, pre-padded DTS,
invalid DTS") broke DTS-HD core-only passthrough.

Fix it.
Make CAESinkALSA::GetParamFromName return string directly

Suggested by elupus to make the code more clear.
AESinkALSA: Factor guessing AEDeviceType to a separate function
fixed: consider "spdif" ALSA devices as S/PDIF

"spdif" ALSA device is an alias for "iec958", though reportedly it may
be exposed via ALSA hints on some systems.

Consider it as S/PDIF as suggested by elupus.
[WIN32] fixed: enable system screensaver when loosing focus (closes #13180)
add sample config file
Merge branch 'master' of github.com:pklingem/fletch
Handle when  returns None.
add workflow transition keywords
add Leo to the list of contributors
add deprecation warning to previous keyword
Merge pull request #33 from plone/workflow

add workflow transition keywords; Thanks to @hvelarde
Oops fixed a typo - habit from using LaTeX too much :)
add blogger picture
Merge branch 'master' of github.com:popomore/chuome
dont escape categories
escape html
script to concatenate all the sections of postgis doc for easier digestion of postgis expert bot

git-svn-id: http://svn.osgeo.org/postgis/trunk@10461 b70326c6-7e19-0410-871a-916f4a2858ee
fix pml not showing responses
cosmetic template updates - updated user comment name
Merge branch 'develop' of github.com:praekelt/ummeli into feature/UMMELI-tom-tom-pilot
added pipeable
removed console.log
start of basic configurable logger. plus log and logtail actions
using actual python logging. also minor cleanups
well, it's a start
Merge branch 'master' into logger
Merge branch 'contributors' of git://github.com/Tocacar/protalk
Merge branch 'master' of github.com:protalk/protalk
Removed beta text next to logo
Merge pull request #102 from lineke/removeBeta

Remove beta text next to logo
implemented addcontext() functions
modified subforum-stuff
Added base TransUnion logic and improved form validation
Fixes for minor typos
mobile footer link css
Handle zkpython binding bugs properly for older versions of the lib.
Add icons for skills.
[BUG #6228] IE < 9 tends to cache overly agressive

This may result in stale representations. Force validating freshness
of cached representation.
[BUG #6857] fixed @return processing

1. made the {Type} element of @return non-optional (this was planned anyway)
2. check if the types array is not empty when constructing api.addTypeInfo
3. fixed @return syntax in qx.bom.Selection

- So, a wrong @return will issue a warning and not be added to the data returned
  from the JSDoc parsing (you could still add an empty type '{}').
- In case of an empty type spec (as with '{}'), an empty list [] will be returned
  as property "type" from the JSDoc parsing; but then no "types" child will be
  added in the api-data.
ACAD-1189: change default/Public implementation name from rSmart to rSmart Academic
Merge pull request #107 from xolotl/ACAD-1189

ACAD-1189: change default/Public impl name from rSmart to rSmart Academic
ACAD-1190: Change Public/default course lecturer role display name to instructor
Merge pull request #108 from xolotl/ACAD-1190

ACAD-1190: Change Public/default lecturer role display name to instructor
[ACAD-1167] Show the placeholder text on load of the sakai2tools widget when there are no settings
Merge pull request #110 from croby/ACAD-1167

[ACAD-1167] Show the placeholder text on load of the sakai2tools widget when there are no settings
ACAD-1193 Add a new Wimba widget
[ACAD-1062] Fix external auth configuration to allow screenreader access
Merge pull request #112 from croby/ACAD-1062-2

[ACAD-1062] Fix external auth configuration to allow screenreader access
[ACAD-1202] Add the ability to set a width for embedded content
Merge pull request #116 from croby/ACAD-1202-develop

[ACAD-1202] Add the ability to set a width for embedded content
[maven-release-plugin] prepare release com.rsmart.nakamura.uxloader-wrap-1.3.1-rsmart
[maven-release-plugin] prepare for next development iteration
NOJIRA rev change log
[maven-release-plugin] prepare release com.rsmart.nakamura.uxloader-wrap-1.3.2-rsmart
[maven-release-plugin] prepare for next development iteration
[SAKIII-6178] Adjust the header size hierarchy to reflect the header level
(cherry picked from commit 6b8d17edbbaf810273cca33402be0f3b4b10d899)

Conflicts:
	dev/css/sakai/sakai.base.css
Merge branch 'develop' into ucscx-develop

* develop:
  [SAKIII-6178] Adjust the header size hierarchy to reflect the header level (cherry picked from commit 6b8d17edbbaf810273cca33402be0f3b4b10d899)
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release com.rsmart.nakamura.uxloader-wrap-1.3.2-rsmart
  NOJIRA rev change log
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release com.rsmart.nakamura.uxloader-wrap-1.3.1-rsmart
  [ACAD-1202] Add the ability to set a width for embedded content
  [ACAD-1062] Fix external auth configuration to allow screenreader access
  ACAD-1193 Add a new Wimba widget
  [ACAD-1167] Show the placeholder text on load of the sakai2tools widget when there are no settings
  ACAD-1190: Change Public/default course lecturer role display name to instructor
  ACAD-1189: change default/Public implementation name from rSmart to rSmart Academic

Conflicts:
	dev/configuration/custom.properties
	pom-bundle.xml
	tools/hashfiles/pom.xml
Node-ffi: more compact output, less valabind magic involved in obtaining working code.
Merge pull request #2 from eddyb/master

Node-ffi support - now with 75% less outputted code
add snippets extension to gemfile template
Updated linkify snippet
different colors in console vs gui
updated powerline to bleeding edge
Powerline patched Ubuntu Mono font
Updated _vimrc to use Ubuntu powerline font under windows
revert to Consolas
Added solarized colors
Added changes to powerlien back again - working in console and gui now
use solarized light and dark based on gui presence
add additional logs
Merge branch 'master' of github.com:rajithd/vigraha

Conflicts:
	modules/data-loader/src/main/java/vigraha/dataloader/repository/impl/GPRSTransactionRepositoryImpl.java
	modules/data-loader/src/main/java/vigraha/dataloader/repository/impl/LBSTransactionRepositoryImpl.java
Fixed ruby1.9 compatibility issues.
Problem 12 fix
Problem 15
Problem 16
Problem 17
Problem 18
fix pause crash
Add OAuthConnection::scopesChanged signal
check_session
added missing non config-package doc/manpage to website
bidding control finished.

Hey Robert, how exactly does your AIPlayer bid? o.o I checked debugging
mode and it returned a bid of 3. Is that for tricks or royals? In any
case, we should change it so that the bidding labels show up properly xD
Sirona related pages
add a check for the root user
add a warning to the ssh config about why a comment is required
replace the OS check by a simple file check
always report the ssh port when a project has been created
move help to its own function for readability
tweak some grammar
add some more comments
forgot to quote some text
more verbose arguments for installing git
remove 'dim' text style
fix potential error in user check
explicitly enable ssh pubkey auth
make git-shell the default shell for the storage user
improve git check
fix last commit
fix typo
git-core package is obsolete
fix style
use verbose command arguments
don't allow force-pushing on the git repos
added endBlock, not fully working
Enable default build of SkyX, Hydrax and OpenAssetImport, tested to work now following the documented build instructions.
Wire up django-crontab
add ::load_From_file to csr, crl, and private key in addition to cert
call out helper methods in the readme a bit more
add method documentation
Initial commit. Add RITableViewDataSource. Not tested.
Added MagicalRecord as submodule
Added TableViewDataSourceSample
Changed a README
Started implementing RISlideMenuController. Left menu completed.
Doc cleanup.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9825 e93f8b46-1217-0410-a6f0-8f06a7374b81
added link to disney partio website
implementação do CRUD de websiteCategory
added nature and source attributes id on inquire model
premier jour de repet - config mad mapper + vdmx c parti
projet avec preset de base
Add paginate for employ and content.
Started docs, beginning with ewma. Added test case for meter and fixed some issues with the scoping in meter.py
- Add helper functions for retrieving meta value
- Separate textdomain function from class
moving right along with the changes
changes
Direct keyboard selection of workspaces 1 to 9.
Expo: be more specific about which modifiers are allowed or not when handling delete key press.
Enable overview mode for the selected workspace as keyboard selection moves through the workspaces.
Make Expo not hide minimized windows; show them as icons.
Optional display of Expo as a grid.
Dynamic horizontal padding, based on the number of items in the row.
Merge pull request #790 from autarkper/expo-grid

Expo view as grid (optional)
Merge branch 'expo-direct' of https://github.com/autarkper/Cinnamon into autarkper-expo-direct
Merge branch 'autarkper-expo-direct'

Conflicts:
	NEWS
Merge pull request #800 from autarkper/expo-kb-selected-overview

Expo: Enable overview mode for the selected workspace on keyboard selection
Merge branch 'expo-overview-show-minimized' of https://github.com/autarkper/Cinnamon into autarkper-expo-overview-show-minimized

Conflicts:
	NEWS
	js/ui/expoThumbnail.js
Merge branch 'master' of github.com:linuxmint/Cinnamon
Merge pull request #835 from autarkper/expo-kb-delete-fix

Cannot delete workspace using keyboard if NumLock is on
ALT-Tab enhancement: Live window preview and outlining of the currently selected item.
 Merge pull request #5 from dalcde/alttab-outline-option (with some adaptations)

 ALT-tab outline option setting
 Allow disabling outline
More precise positioning of frame and clone windows.
Use a drawing area to paint the outline.
Use border-radius specified in stylesheet in alt-tab outline
Alt-tab outline border-radius.
Let the system draw the alt-tab outline borders.
RIP, Derick the Soldier
prudence!
treasure haul by rocky/delian
prudence has a spell book
Added my Siri Icon Project for my PaintCode app review.
[Issue #74] added pagination to parkings
Merge branch 'release/v0.2.0' into develop
Updated README with the star and unstar action.
Merge branch 'develop'
Добавлены скрипты для подачи заявки и офигенный модальный диалог
pre-beta changes
working on org-mode gtd

Signed-off-by: Ronert Obst <ronert.obst@gmail.com>
still working on org-mobile

Signed-off-by: Ronert Obst <ronert.obst@gmail.com>
removed all MobileOrg auto sync stuff, causing too many problems

Signed-off-by: Ronert Obst <ronert.obst@gmail.com>
加上2012總統大選的csv資料
convert application.css to Sass
enabled ruby-debug19 gem for debugging
Bump rails version to 3.2.8 for security fixes

This change addresses vulnerabilities:
     CVE-2012-3463
     CVE-2012-3464
     CVE-2012-3465
Fix broken tests
Fix quote being escaped in page title

Rails 3.2.8 is much more strict about escaping quotes than previous
versions have been.
misc blog fixes
numéro article CGU !
mksysinfo.sh: Fix handling of glibc 2.16 bits/resource.h.

From Jakub Jelinek.

R=iant
CC=gofrontend-dev
http://codereview.appspot.com/6352087
more preview work
Merge branch 'master' of github.com:rstudio/rstudio
New mp3 player; Fixes for IE
23 и 24 выпуски
Added comments to services
kc: prefer no magic mode
adding missing GUI components for openID authentication
adding a missing final
PLEASE CHECK: adding authID to URL (necessary for the validation RPC) - it seems to work but not sure if this is the right way
Update src/gui/src/main/java/cz/filmtit/client/pages/TranslationWorkspace.java

missing break
0.0.5-alpha "Rubble Time"
クリティカル率に計算式が使用できない不具合を修正
Reusing client threads in stressor
Using Infinispan 5.2.0.Alpha3
Exporting JMX statistics
database update
Merge branch 'master' of github.com:rve/MidasReader
baby!
Add newline to beginning of output.
Fixed Boost Jam crash when the SPLIT_BY_CHARACTERS rule gets passed an empty list as any of its arguments.

git-svn-id: http://svn.boost.org/svn/boost/trunk@78575 b8fc166d-592f-0410-95f2-cb63ce0dd405
Minor stylistic change - trimmed trailing whitespace.

git-svn-id: http://svn.boost.org/svn/boost/trunk@78576 b8fc166d-592f-0410-95f2-cb63ce0dd405
context: update performance section in documentation for i386


git-svn-id: http://svn.boost.org/svn/boost/trunk@80108 b8fc166d-592f-0410-95f2-cb63ce0dd405
context: update documentation


git-svn-id: http://svn.boost.org/svn/boost/trunk@80109 b8fc166d-592f-0410-95f2-cb63ce0dd405
Merge from trunk

git-svn-id: http://svn.boost.org/svn/boost/branches/release@78177 b8fc166d-592f-0410-95f2-cb63ce0dd405
Merge from trunk

git-svn-id: http://svn.boost.org/svn/boost/branches/release@78178 b8fc166d-592f-0410-95f2-cb63ce0dd405
Implementation of Flatten method in ruby
ISO-8859-1 fallback patch so that my blog works ;)
Merge branch 'master' of git@github.com:s9y/Serendipity
another php5 combat assign reference issue
another str_repeat math issue
Implementado modo racional...
Fix parameter bug in Swedish translation.
Update texts for 0.7.1 RC2
Commented EditExerciseActivity.java
10.15 04:40 document update recyclebin_list.php
tank auth add

회원가입 추가
Merge branch 'master' of git://github.com/saegeul/saegeul
VLC: Fix a bad variant name


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92600 d073be05-634f-4543-b044-5fe20cf6d1d6
version bump to 2.0.6


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92601 d073be05-634f-4543-b044-5fe20cf6d1d6
quagga: fix build on 10.7 (#32535), use add_users, set license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95035 d073be05-634f-4543-b044-5fe20cf6d1d6
ocaml-bolt: fix license


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95036 d073be05-634f-4543-b044-5fe20cf6d1d6
mldonkey: fix optflags (#32543)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@95037 d073be05-634f-4543-b044-5fe20cf6d1d6
yaws: adjust livecheck


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99191 d073be05-634f-4543-b044-5fe20cf6d1d6
pspp-devel: update to gea2f72


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99192 d073be05-634f-4543-b044-5fe20cf6d1d6
emacs-mac-app: fix post-destroot.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98895 d073be05-634f-4543-b044-5fe20cf6d1d6
port fish: moving docs into a directory specific to the port
should fix https://build.macports.org/builders/buildports-snowleopard-x86_64/builds/12154 and https://build.macports.org/builders/buildports-lion-x86_64/builds/5656


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99421 d073be05-634f-4543-b044-5fe20cf6d1d6
Adds iPad version
Merge branch 'master' of github.com:saleiva/freeder
Configure script: Ignore GNU/autoconf options that are safe to ignore
Configure script: Support "--enable-*=no" syntax
Allow --libexecdir to be configured independently of --libdir
Make the PKCS#11 module path configurable in ~/.config/fribid/config
More focused example group searching
Fix unmarshalable RSpec::Core::Time
Distribute cucumber scenarios, not files
Fix Rails already initialized error

Ensure RSpec and Cucumber load the same environment path. Cucumber was
loading /private/tmp, while RSpec loaded /tmp. Ruby would attempt to
load two separate paths which resolved to the same instance of Rails.
RSpec 2.12
about us post
execute hooks correctly and abort during failure of setup
prepared 0.13.0 release
Implemented add/delete columns
rails project--3rd commit
New Formula: opencolorio

OpenColorIO (OCIO) is a complete color management solution geared
towards motion picture production with an emphasis on visual effects
and computer animation.  See:  http://opencolorio.org

OCIO is at version 1.0.6 and has been in development since 2003. It
is one of several open source projects actively sponsored by Sony
Imageworks.

OCIO is a new dep for OpenImageIO (OIIO), adding functionality.

OCIO has a built-in test suite that is passes.  There are stable
and head methods available.  It builds using the system OpenGL,
and little-cms2, along with pkg-config and cmake.  An Alias is
added for this formula to ocio.  It has python bindings enabled
with a user option, following the example of vtk.

OCIO head and stable build and run very well on Lion and SL using
all five compilers from XCode-4.3.2, 4.0.2, and CLT-4.3.2, thanks
to patches the devs merged upstream for us.

EDIT: code fix redacted args.
EDIT: shrink formula comments.
EDIT: test against XCode-4.3.1.
EDIT: remove the unnecessary which python-config
EDIT: change to version 1.0.6.  Remove rescue clause.  Tests work.
EDIT: tests pass against XCode-4.3.2.
EDIT: modify the caveats for accuracy using the dev's suggestions.
EDIT: remove the `\n` after the caveat url

Closes #10669.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
opencolorio: install Python lib to site-packages

Incorporates upstream patches to install the Python library into
site-packages instead of directly into lib/
afflib 3.7.0

Closes #11377.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
coreutils: symlink all binaries

Instead of maintaining a list of binaries, just symlink
everything found in bin.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
AvocadoDB 0.3.7

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge branch 'master' of git://github.com/mxcl/homebrew into tiger
Added Railscasts link to the quick links section
Merge pull request #8 from arnabc/patch-1

Added Railscasts link to the quick links section in readme
Removed jQuery UI and Github dependencies.
Renamed all to doc.js instead of ghdoc.js
Update master
doc
Add HTML5 boilerplate printing styles
Add HTML5 boilerplate printing styles: reference
minor stuffs...
AUDIO: Fix QDM2 extra data parsing
GOB: Hook up the Penetration minigame in the cheater
COMMON: Fix spelling of length
PARALLACTION: Fix spelling of length
SCUMM: Fix spelling of length
Already better looking... But long road, still
Update dotfiles from script
Update dotfiles from script
Update dotfiles from script
Update dotfiles from script
Update dotfiles from script
add teaches_in for excel
Merge BUGS and KNOWN_ISSUES.
Update NEWS and TODO.
Move YAFC_PRINTF to syshdr.h.
Création lien CSS
- Création dossier ressources/css
- Importation helper url
- lien dans le header: 
	<?php echo base_url('ressources/css/style.css'); ?>
Ajout .DS_Store au .gitignore
[NEW] OpenCL pass type attributes (shared, global, constant) down the call tree, so we can properly handle address space qualifiers
Changes in queryparser.lemony for error with Quotes (Point 2.a in summary.rst)
Design changes #6
added table list to docs
Toast wenn Track abspeichert
Cache collapsed row data.
First (terrible) attempt at row insertion (#10).
Generate 2D array of objects from the back-end.
Restructure back-end data representations.
Temporary commit; squash later.
Commit somewhat stable state.
Fix clustering with gene subset.
Another temporary commit.
Add missing file.
Fix patient reclustering.
Fix clickability of unclickable feature labels.
Fix info panel for clinical data cells.
Fix cell tooltip for Chrome and Safari.
Fix glitch when not clustering patients.
Clinical vars in initial feat. list and in subset.
Fix misaligned dendrogram when last gene expanded.
Fix pileup in info panel for unmutated locs.
Fix glitch when clustering 1-2 genes.
updated .gitignore
Everything works, this is ridiculous. I could speed it up, but I'm going to take a break from this project, since it has been driving me insane for far too long
implementing the interfaces

Signed-off-by: Ronaldo Nascimento <ronaldo1@users.sf.net>
deleted hardcode
build user
mailer
caching
dalli caching
added stage level timer spec; found timer bug, acceptance spec win  \o/
add JobResponse and return it in Job function
add exp like [a-z]
new macvim
lib: move source-relative out of init
lib: move is-callable out of init
lib: remove extension from realpath.zsh
Merge branch 'master' of git://github.com/zoppo/zoppo
init: fix functions:autoload
lib: add sort_by_length
reformat Makefile
Update Makefile
recommit makefile
Sort Plugins
Fix spell missing and so on...
Set previewheight for Uite/VimFiler preview action.
Folding to Plugins list.
Set h2u_black on .vimrc
Fix Error: delete previewheight on .gvimrc
Fix Writings
Add Plugins: textobj-indent
Change colorscheme to "jellybeans"
Remove Plugins: showtime.vim
Enlarge preview-window for Unite/VimFiler "preview" action
Highlight unwanted spaces, "Zenkaku" and "Trailing whitespace"
Update css.snip

Add few items, and Fix spaces before vendor-prefix
git rm vim-css3-syntax
Remove setting the alternate URL

If desired user can set an alternate url with the following
command:
git config --global url."git://whatever.com/".insteadof
	"git://github.com/sillsdev/"
This is more flexible than hardcoding the alternate URL, and
it is easier to turn on and off (by simply commenting it in
the global .gitconfig file).

Change-Id: Ica5056ecb0baa696c7f8e8eefcf0fcfd9d05e259
Adding porting changes
1.9 mode is supported
add jruby-head on travis
Merge branch 'master' of github.com:sinatra/sinatra
some progress with rendering
We're now grabbing the stream URLs before delaying. This assumes that
the generated URLs are still valid later.
Stop minecarts sinking into blocks.
footer
Changes
home page
even saner numbers
updating with the latest libraries. adding mesh.time(). mesh.setPrompt()
is now called mesh.prompt().
taking out astericks
Now I'm just debugging Travis.
remove a few unused lines.
Merge pull request #39 from sorvell/master

g-component minor fixup; updates for g-page and g-panels
update to use the new g-component sugar
Merge pull request #40 from frankiefu/master

update to use the new g-component sugar
Merge pull request #42 from sorvell/master

update g-ajax and minor g-panels and g-page fixes
Update RushHour.cpp
Modified gitconfig for --short flat on st command
Fixed bug with tmux and
Fixed little bug
Merge branch 'master' of github.com:sparks/dotfiles
Set the default trace level to be 'TLVL_NONE' rather than 0, which is 'TLVL_ALL'. Shuffle some includes from the read parsers implementation file to the read parsers header file.
Further work on Makefiles: strip library and example binary
Use composer to handle php dependencies.
Use bower to handle front end dependencies.
Use Zend_Application for application bootstrapping.
Use codeception for testing.
a bit of pylint cleanup. low hanging fruit and things i agree with for now.
finish wiring the product page and is able to get from database
merging files
Moved retrieving code to be in the same line as rest of code
fixes to build file
better error msg on unsupported types
add support for longs & floats
Dropped README.asciidoc from npm spec because npm doesn't recognize AsciiDoc. Bumped version number.
Adding missing template for contact form
Finance pages pt2, more clean up soon
Separate ChatOutput class from MainWindow

Some changes are added, refactors reuse of QTextCharFormat,
QTextCursor, add message slots, and auto-link.

For more details, Check Issue #43

Signed-off-by: Ikkei Shimomura (tea) <Ikkei.Shimomura@gmail.com>
Protect interval length and position with a lock

The audio thread updates the interval position each time new samples are
processed.  When the end of the interval is reached, the metronome and
interval length are recalculated.  NJClient::GetSessionPosition() can
see inconsistent values where interval position is greater than interval
length because no lock is used.  This triggers a Q_ASSERT() in
MetronomeBar.

This patch performs the interval length and position update with a lock
held so that the client thread always sees consistent values.  This
fixes the assert.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
fixed $this
Implement filter for the entry bindings search dialog.
Check what has changed?
Add a notification config view
removed error message for non objects
Fri Dec 21 08:57:26 CST 2012
Modified behaviour of GroupProperty to return null when all contained properties are null.
add new hydrusProperties datastream to store terms of deposit and approval required; update fixtures; add new tests
RAXAJSS-91 - Upgrading to Sencha Touch 2.0.0 and ExtJS 4.1 final releases
Issue #RAXAJSS-91 - Upgrade Sencha Touch 2.0 to the final release and ExtJS to 4.1
Fix graphviz 2.28.0 and multiple pages.

git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20318 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
Fanchart: nice gradient when used based on hsv


git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/trunk@20330 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
finished the dirac operator remapped. Will it work?
Fixing worryee to use a specific version of the twitter gem
Merge branch 'master' of github.com:suttree/worryee
g model student
added optional argument tests for closures

git-svn-id: http://haxe.googlecode.com/svn/trunk@4646 f16182fa-f095-11de-8f43-4547254af6c6
fixed as3 property access on interfaces

git-svn-id: http://haxe.googlecode.com/svn/trunk@5031 f16182fa-f095-11de-8f43-4547254af6c6
fix for nested macro using (fixed issue #640)

git-svn-id: http://haxe.googlecode.com/svn/trunk@4574 f16182fa-f095-11de-8f43-4547254af6c6
Updated reflectasm version in the POM.

git-svn-id: http://kryo.googlecode.com/svn/trunk@261 a9660ef0-a895-11de-8ba5-91705c1537ed
I don't have a build chain set up on windows. So the keyboard handler is not in the kernel, it only exists in a prototype.
Renamed Person Attributes and made them Core Attributes
Difference graph interface
first couple pieces implemented
special_menu_items - fs
fs
fs
Merge branch 'dev' of github.com:syddjurs/os2web into dev
Cut out theme section
[Console] fixed some CS
In console terms columns are width and rows are height
merged 2.0