labofsahil/github-event-dataset-2012 huggingface dataset:
mas assets 
more assets
child aded to A5
assets video  & image 
childs completos 
modificaciones videoNodo imageNodo
Listo el maquetado de los nodos
fin nodos
Merge branch 'dev' of https://github.com/nachoalthabe/K1.git into dev

Conflicts:
	estilo.css
	recursos/views/inicio/inicio_view.jsclass
interactive gov: fix freq table index (min is the last one for us)
Adding basic configuration to vimrc
Устанавливаем св-ва модели через setProperties
3.2.3pre2_11 Restore PythonProcess

PythonProcess is restored. A problem with session monitor is solved.
Updated _posts/articles/2012-08-30-test.md
upload Training Wheels avatars
user-ride association working
cancelなどの機能を追加
remove token-groups (unused)
confirmed

still some finickiness on wrapped spaces too
add mytools/mytools.go
fix word spell mistake
Commit to (path 3/15 on dps base camp) improve support for not playing full-episodes on the iPad
Changed loop-single also
Successfully detect when writing

It's easy! It's just flags :)
medialibrary: fix tree/iconview get_path_at_pos usage
Integrate my lightweight rank into search codeflow
main: emulate --errors-to-stdout
added createNodeIndexCommand
fixed white gaps
fixed "jumping" stage background after leaving the menu
daemonization assenization
Only show user on home screen if more than one user
added features to patchqueue
added termcolor module, new features for mq and moz build
send concatenated tests to qunit
added default filters for balance list and invoice list.
This reduces the load on the database.
Merge pull request #61 from nicraMarcin/filters

added default filters for balance list and invoice list.
reczne poprawki przed merge balancelist i invoicelist
[tags+replaygain] Make ReplayGain normal tags in CMusicInfoTag - we have to read all the tags to get the data anyway.
[tags] Remove parenting from CTag to CID3Tag
[tags] Remove old AAC, Ape, Flac, MP3, MP4, MPC, Ogg, WMA, and WavPack TagLoader header file dependencies
[tags] Remove old AAC, Ape, Flac, MP3, MP4, MPC, Ogg, WMA, and WavPack TagLoaders from Xcode project and remove files on disk
first version of email stamping (non-encrypted yet)
start service if not already started
clean filenames from kickass torrents
added output view
Rename mhash to mhashlib.
The Service time area is now controlled by a widget. This is so the content could be updated dynamically

Signed-off-by: Michael Lee <heymikelee@gmail.com>
fix traceroute regexp.

(Cherry picker from commit 42fd17be23ad8f07560fe5a11f45f327c99cf75a)
Build 0.0.13

Global history
style update, people, publications, teaching, software
NodeBox no longer looks at the casing of the file extension when exporting.
This fixes #159.
fixed yphysics, improved yphysics_test
Merge branch 'master' of github.com:nonchip/YEngine
Fix openIP symbols and library to have non-global power.
Update circus/sockets.py

#248 : load proto only if there is one specified in the configuration file.
Adds hostname verification to the vertx DefaultHttpClient, along with accessors to disable it. Hostname verification is an essential part of the HTTPS specification (rfc 2818 - http://tools.ietf.org/html/rfc2818#section-3.1).  Without it, vert-x is fundamentally insecure and open to man-in-the-middle attacks as clearly explained/substantiated in this article:  "The most dangerous code in the world: validating SSL certificates in non-browser software" (https://crypto.stanford.edu/~dabo/pubs/abstracts/ssl-client-bugs.html).

The fix adds hostname verification by adding the "HTTPS" endpoint identification algorithm to the SSL parameters if SSL is enabled on the client.  Note that creating the SSLEngine object now takes the request host and port; this is really only a requirement if hostname verification is enabled, but I didn't see any harm in including it for all SSL cases.
Create an HttpClient interface (SharedHttpClient) that is designed to be shared, and can not be left in an unknown state by any code path.
Eclipse is quite boring...
Pfff
Tried some Bootstrap formatting.
Fixed installer SQL files being blank
storing some specific files in the filesystem for better performance and memory footprint
cfg: add icnova_imx53_sodimm board config

Add board config for In-Circuit ICnova iMX53 SODIMM

Change-Id: I3802ab1695baa75c1f170cf1af0e38ada284c0b8
Signed-off-by: Wjatscheslaw Stoljarski (Slawa) <wjatscheslaw.stoljarski@kiwigrid.com>
Reviewed-on: http://openocd.zylin.com/543
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
flash: handle zero when reading stm32 flash size reg

Some variants read 0 for the flash size register, rather than
failing lets assume we have max flash fitted.

Change-Id: Ie1fb4e73606f49268a6fd5921c3aef75bc4790d3
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/744
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Deleted file and added binary attribute.
Readded program.
Commit new changes to the @new@branch
15-puzzle game start 14:01
Merge remote-tracking branch 'origin/master'
2.3.2 putting the micro...
Finish demo app
NXP-6931: Section content is not refreshed after a publication refusal
NXP-9852: Fix selected columns order on advanced search (tests)
Expose method in BaseFeatureManager:
getManagedFeature(final String name, final boolean isFullyQualifiedName)
Make properties in PropertyContainer removable.
removed the getNextDiscussion() method
Remove namespace not only from elements and attributes from elements with namespace, but also a) from attributes of elements that do not have a namespace themselves and b) from the rootElement and its attributes. Now I can finally get the more-query from the data.
Method to add discussions instead of replacing them
refactoring: extract classes
Refactoring: Extract classes for reuse
add command to load more discussions
make jazzDao getMore mechanism more robust, change query from Colection to Collection for productive use
set default page length to 50
cleanup and fixed #34
started with including iterations
Merge remote-tracking branch 'origin/master' into 46-describe-tool
Fix brainos; nuke tedious display
implementing TIntegratorBase,adjusted to TintegratorOneDim and tested
anaesthetic_type => anaesthetic_type_id
1.6.1 version bump

Change-Id: I683633ef1c7a5df7522299a85090f1ffda0c287a
update chef_db:bulk_get/4 with recent schema changes for clients

Since client records do not have a 'serialized_object' column we need to
transform the chef_client records returned by our bulk get into a list
of ejson representations.
hw5-2
hw5-1 done
Buggfixar, "finishing" touches.

Kan läsa in filer och lösa pussel. Som en boss.
load SiteInfo model before loading its model
work in progress, half admin panel done already with php validations
PHP validation done
Merge branch '118b' into develop
implemented pagination at emails, added frm & index at emails folders (theme default)
Improved thread pool schedule functions to return the current number of used threads.  This will allow implementations to determine number of task pending after a thread has been scheduled.
Apply prettyprint.
Merge branch 'master' into gh-pages
cleanup
fix casting warning
iASL: Update help info for supported ACPI tables.

This change updates the help info that displays data about the
supported ACPI tables (-ht option.) Also removes duplicate
FADT entry.
Makefiles: Update linker invocation.

Move the linker flags to the end of the command line.
Otherwise, the link will fail on some platforms.
Guan Chao.
Remove all use of deprecated _GTS and _BFS methods.

The _GTS (Going To Sleep) and _BFS (Back From Sleep) methods are
essentially deprecated and will probably be removed from the ACPI
specification. Windows does not invoke them, and reportedly never
will. The final nail in the coffin is that the ACPI specification
states that these methods must be run with interrupts off, which
is not going to happen in a kernel interpreter. Tang Feng.
Note: Linux has removed all use of the methods also. It was discovered
that invoking these functions caused failures on some machines,
probably because they were never tested since Windows does not
call them.
Add multi-endian support to the _PLD decode routine.

Deploy the multi-endian macros to extract data from the _PLD
buffer.
Rename dialog module names.
created nlgenLib/
created basic structure
Updated _posts/report/2012-12-10-report-en.md
Added BedInteracts in nether; Cancel bedblack in dream
added authentication using session id
Merge branch 'master' of git@github.com:MG-RAST/MG-RAST
Merge branch 'master' of git@github.com:MG-RAST/MG-RAST
Merge branch 'master' of git@github.com:MG-RAST/MG-RAST
fixed bug with duplicate key names in job metadata
Merge pull request #76 from teharrison/master

fixed bug with duplicate key names in job metadata
Merge branch 'hotfix-3.2.2.1'
Merge branch 'master' of github.com:MG-RAST/MG-RAST into develop
fixed bot detection
Merge branch 'develop'
fixed header on detailpage
added skeleton for task 2
Typo corrected.

 - Obvious typo in 5, 15 (checked on online image): ταῖς πλείο[σι] κρίσεσι, κρίσεσι,  -> ταῖς πλείο[σι] κρίσεσι,
 - Typo corrected.

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>
Update revisionDesc

 - Vote - Accept-Straight-to-Finalization - Fine. (James Cowey)
 - Finalized - Ready. (James Cowey)
Problem corrected in line 1.

 - Line 1: "[χαίρει]ν ~|?.|~la" -> "[χαίρει(?)]ν."
 - Problem corrected in line 1.

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>
Update revisionDesc

 - Vote - Accept-Straight-to-Finalization - Fine. (James Cowey)
 - Finalized - Ready. (James Cowey)
Text entered on the occasion of the Coptic Summer School, Heidelberg. Under supervision.

 - Created from SoSOL template
 - Text entered on the occasion of the Coptic Summer School, Heidelberg. Under supervision.

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;0671' (DDB_EpiDoc_XML/sosol/sosol.2012/sosol.2012.0671.xml) to 'papyri.info/ddbdp/cpr;31;9' (DDB_EpiDoc_XML/cpr/cpr.31/cpr.31.9.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/cpr;31;9'
Update revisionDesc

 - Vote - AcceptText - Accept. Line 1: $m1 is not necessary: remove it. (Alain Delattre)
 - Vote - AcceptText - l1: delete underdot in ⲉⲓⲥϩ̣ⲁ ⲓ(¨) (Lajos Berkes)
 - Finalized - ready (Lajos Berkes)
Using a table for intermediate entities WIP.
Principio de capas
Committing original threaded image loader. Will change it to use concurrent deques and maps to make it even better.
New version, using concurrent queues. This is a much more versatile and efficient way to let threads share data.
Adding in JSONEncoders
Adding in an init script.
Tweaking around with some voodoo.
cache next/prev_position in CachingMixin

caching makes sense here as these recursive functions are superslow
fixed ctrlc and ctrlz in shell
[AEG] Gods
Final Review
Issue#: NEWSOURCE-139


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18355 b6a209e6-650d-0410-972b-dadffa731f64
[AEG] Gods
Final Review
Issue#: NEWSOURCE-139


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18356 b6a209e6-650d-0410-972b-dadffa731f64
Fix bug: [Ultimate Combat] Cavalier archetype Emissary problems
Issue#: DATA-769


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18328 b6a209e6-650d-0410-972b-dadffa731f64
added tests to check for working exercises pages
Simplified the course cat
Simplify the course cat
Make parsing easier
Add Graph and nodes.
Rename Variables
Delete original graph file, merged with other .py
Write tags in dumped file, fix #745
sum and squareSum must be Longs
new example package
Error de importación
- clean up according to last changes to View-Class
unneeded "s"
Allow anyone to fetch unhelpful reviews via the API

closes #22
Fix missing patch attribute on a few resources
Missing comma
Remove superfluous defaults
Merge remote-tracking branch 'patch/fix-missing-patch-attr'
#90 Clean up blaskan_head()
complete forget and reset password functions
Merge branch 'master' of github.com:peterchou/koala
Update universite-de-liege-histoire.csl

Authors: Family name comes first, then first name abbreviated (now complies with Dep of History's referecing rules)
LoginSuccess
old school file uploads
leave out lost ones
[artf469638] - Tool Tip for the videos in Home page is showing wrongly issue fixed
FileUtil Package changes
[artf532703] In AdminUI -- CheckBox CheckAll issue in all list pages fixed
Merge branch 'master' of https://github.com/phresco/service
bug fix by florent
add a todo item
simplify trigerType to hover and click
move id/className/style from overlay to widget. close #119
Merge branch 'master' of github.com:alipay/arale
fix a bug in example. close #133
fix
将dialog改名为baseDialgo
Merge branch 'master' of github.com:alipay/arale
关于网页中浮层消失后的焦点处理
reset range for calendar
define hide on select
data-api fix
避免当 elem.focus() 时的一个诡异的定位 bug
Merge branch 'master' of github.com:alipay/arale
add copy non-js file
support onXx using setter format in initialize.
Merge branch 'master' of github.com:alipay/arale
simplify little code in dist script
resolve #130
handle blur for calendar. bug on ie6
Vimrc tweaks...still working on this beast.
Translation_Abstract: changed clearDependedCache to a abstract method

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1988 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
Translation_Abstract: bugfix - added getValidTranslationKey() and use it in getByKey() - otherwise camelCased translations would be overwritten because the key won't be found

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1989 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
first pass at result notification prepare template
here is my sample code :)
Add some usage notes.
clean up rest file
- added dir for ff (ff_SN, Fulah locale) messages
- release 2
- mpeg4ip work done
Implemented Windows visuals.
prj control related code are no longer controlled under kejian-tv, they should reside in a separate project
Создание ConstantValue.
Added operation to remove space member
Don't generate XML for doxygen
Add method for a humanized value
some usability changes for mobile guis, e.g. bigger scrollbars etc. maybe the last ones before a alpha release???!!? ;)
Fixed bug with Linux platform event polling
add powered by odst
#2101, sql functions for selectivity inspection


git-svn-id: http://svn.osgeo.org/postgis/trunk@10725 b70326c6-7e19-0410-871a-916f4a2858ee
Better/different error messages in stats interogator


git-svn-id: http://svn.osgeo.org/postgis/trunk@10726 b70326c6-7e19-0410-871a-916f4a2858ee
Ghost button does not work on ICS atm, disable it
another 'template' for future generalized use on arbitrary SQL queries
HTTP_REQUEST2 Update1
added project setting filter in line sizings
Trying to find out why we are getting wrong number of arguments in travis
update examples to work with master

Signed-off-by: Steven Armstrong <steven.armstrong@inf.ethz.ch>
Merge pull request #50 from asteven/bugfix_update_examples

update examples to work with master
Added connection with google via OpenId
Made suggested changes
Fix docblock typo
Merge pull request #89 from Bendihossan/tag-admin-changes

Made suggested changes on TagAdmin
debug aus teardown heraus in article test
Removed deprecated jQuery Update & Twitter Bootstrap UI , added jQuery Multi instead
Add class for fare locations
Displays hours in list fragment
Enable html editor
Create security_card_view and fix rake spec.

Fixes #15 by replacing the security card view.
Fixes table_name_prefix issue by updating foreigner to 1.2.1.
Fill in some missing test coverage
Fixes a typo in the Ion_Auth library that kept user activation emails from sending
Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/develop
Fields should be limited to the applicable namespace we are working in. Duplicate slugged fields will shit here since slugs / fields don't have to be unique across namespaces and everything is keyed by slug. This is part 1 / 2.

Perfect example is I have two fields in two namespaces with two setups / types both named Status (status) and only the latter is returned due to the key indexing here..
Merge pull request #1629 from RyanThompson/patch-5

Fields should be limited to the applicable namespace we are working in. ...
[BUG #6423] Fixed positioning of native scrollbar on appear.
[BUG #6799] Add a pixel extra in chrome >= 22 to make sure labels fit in and don't show ellipsis.
bumping branch version number to 2.0.1
not bind escape to copy-mode
Implemented lists and the cons operator.
Tambah banyak + keterangan div
workaround for when the uri is found in @req
Notes for Sugar lecture.
2.0.3 is released!
fix missing declaration, remove old one
Fixed typo in spalgs week 1 ex 1
Added figure 4.
Final changes to everything
Migration scripts for old data
添加bind的实现，供需要时使用
Fixed place.php  and info.php (url filter, save)
Merge
Disable links when no access
Additional control fields
Renamed downloader to Http11DownloadHandler and some refactoring

Only for HTTP, not HTTPS
Test on expected body length instead of request method (HEAD case)
Merged r10137 from trunk to 1.4-stable (#10320, #10818)

Gemfile: prevent "rake db:migrate RAILS_ENV=test" causes exception on Ruby 1.9.3.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/1.4-stable@10139 e93f8b46-1217-0410-a6f0-8f06a7374b81
Test for when group does not exist.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10002 e93f8b46-1217-0410-a6f0-8f06a7374b81
Bulgarian translation updated by Ivan Cenov (#11994)

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10529 e93f8b46-1217-0410-a6f0-8f06a7374b81
Tests broken by r9573.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@9575 e93f8b46-1217-0410-a6f0-8f06a7374b81
Add new update for user table.
dig-color file added
add status in dashboard
About dialog and base class for dialogs
prepare release 0.0.1
Whitspace change to test push ability
Reverting colors in the QT widget
Can't start the game after joining
events work after rescaling too
Joined users can't start the game
Merge branch 'master' of github.com:rlepigre/tin171
Checkpoint:  CommandArgumentParser started
Adding automatic animation
New spellcast events, game mechanics page
Add unit test for SentryAppender for log4j
Add unit test for SentryAppender for log4j
Initial Commit for Core Java Project.
Refactor api.id_for (easier reading).
destructuring and avoiding regex in gulo.core
adjusted dwca-urls function to map a keyword arg across a vector
Merge pull request #16 from danhammer/develop

destructuring and avoiding regex in gulo.core
cleaned up read-latlon
Merge pull request #17 from danhammer/develop

cleaned up read-latlon
Fixed up docs to reflect use of csv instead of tabs
Add progress-bar-stripes
Optimized _.b64ToBytes().
Fetch words
assembler: write in correct endian
add proper string escaping and fix some bugs
sort fixup list: the disassembler cant deal with it otherwise.

AGS probably as well.

this leaves us with two remaining issues:
labels are not being inserted, or at least the disassembler cant
detect them any more, and string fixups are broken in that the
same string is displayed for all entries, but the start pointer
shifted by 1 each.
Добавлена скачка архива
Начато согласование
Add support for method chaining to ByteBuf
Merge pull request #664 from netty/method_chaining

Add support for method chaining to ByteBuf
Fix NPE which accours when Netty was used in an Applet. See #669
[#670] Intermittent IllegalStateException with ByteToMessageDecoder impl with bounded inbound buffer

* Ensure to call discardReadBytes() before giving up expanding the buffer
[#670] Intermittent IllegalStateException with ByteToMessageDecoder impl with bounded inbound buffer

* AioSocketChannel.expandReadBuffer() should not call discardReadBytes()
becuase it messes up with NIO.2
Upgrade to apiviz 1.3.2.GA. See #676
Change ChannelInboundMessageHandlerAdapter.beginMessageReceived(..) to return a boolean that will be used to check if data should be processed. See #674
[#662] Fix race in AioEventLoopGroup

- Ensure the event loop threads are never terminated before all tasks
  submitted by JDK are executed
- Close all open connections before terminating an event loop
[#662] Fix race in AioEventLoopGroup

- Fix a bug where shutdown() blocks indefinitely sometimes
Check if message is supported before cast. See #678
Fixed NaN bug for fixed particles with infinity/infinity
screen resolution switch in settings_graphics_menu works now
Rename survey to response
s/survey/response/
Added SQL tutorial
Added two CREATE INDEX statements
FK constraints not covered
Merge pull request #6 from dserban/gh-pages

Added SQL tutorial
That paging implementation didn't work. I will improve my memory manager
soon...
on testmerge
on master
Merge branch 'testmerge'

Conflicts:
	testsdl.cpp
new commit
add comments into make
delete the stock data file while finializing
Merge branch 'master' of https://github.com/roynwang/RStock
add function to show text at the up left corner
add logic to track input; Not complete
More stats
Merge branch 'Design'

Conflicts:
	css/style.less
Added DS_Store to .gitignore
Figured out how rows should be specified
Moved to a much more modular method of displaying results
Merge branch 'Design'
Added new design to live site
Icons so far

Added icons for the existing data
more clear css
described changes for version 0.5.0
Update broken links to tenderlovemaking.com

It appears the author of the site has updated the structure of the URLs and does not link the old style ones.  The URLs pointing to tenderlovemaking.com have been changed to reflect this.
Merge pull request #36 from Gazler/gh-pages

Update broken URLs on C Extension guide.
_{} for markup; _[] for nodes; _() for text
Disable indentation in pre
extract $PASSWORD from ENV['HTTP_AUTH']
Tweaking sliders
I finally found out what's taking so long in GUI. It was those three lines.
adding document creatin SD
adding the SD to documentation
Including the MediaSource in the UserSpace database mapping.
+ registration without email
Merge branch 'master' of https://github.com/runn1ng/FilmTit
[maven-release-plugin] prepare release txt2srt-project-1.0.8.2
Convert function parameter for inner array size into template parameter and make identifiers in array_deleter consistent with those in array_utility 

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

git-svn-id: http://svn.boost.org/svn/boost/branches/release@78115 b8fc166d-592f-0410-95f2-cb63ce0dd405
Comment out bad advise in documentation ( refs #6786, refs #6663)

git-svn-id: http://svn.boost.org/svn/boost/trunk@78015 b8fc166d-592f-0410-95f2-cb63ce0dd405
Somehow multi_array was picking up enable_if/disable_if from the ether, but
the ether is now gone.  Explicitly including the needed headers now.


git-svn-id: http://svn.boost.org/svn/boost/trunk@78531 b8fc166d-592f-0410-95f2-cb63ce0dd405
New Formula: dropbox-api
nl2br better config mismatch check
reworked ctor for Maple
Update text files for 0.7.5RC1
Cleanup NSIS_Installer.nsi and package.py.
fixed indentation
fixed compiler warning
Add an assert to track if we try to use an rpc_context after it has been destroyed
math/petsc: update to version 3.3


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94054 d073be05-634f-4543-b044-5fe20cf6d1d6
math/arpack: change depends_build to depends_lib, remove redundant flags. closes #34369


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@94055 d073be05-634f-4543-b044-5fe20cf6d1d6
ref r93823, increased revision of 32 dependents


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93824 d073be05-634f-4543-b044-5fe20cf6d1d6
Bump to 4.1, first version to officially support clang 3.1/3.2


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99241 d073be05-634f-4543-b044-5fe20cf6d1d6
graphite2: update to 1.2.0 and ensure python >= 2.6 is installed before the tests are run


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99242 d073be05-634f-4543-b044-5fe20cf6d1d6
harfbuzz: update to 0.9.5


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99243 d073be05-634f-4543-b044-5fe20cf6d1d6
pango-devel: revbump for new graphite2 library version; add explicit dependency


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99244 d073be05-634f-4543-b044-5fe20cf6d1d6
pango-devel: default to glib2 not glib2-devel


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99245 d073be05-634f-4543-b044-5fe20cf6d1d6
db52: port upgrade, changed download locations again


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91156 d073be05-634f-4543-b044-5fe20cf6d1d6
R: update to 2.14.2, closes #33512, #33044


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91157 d073be05-634f-4543-b044-5fe20cf6d1d6
db53: new port/major


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91158 d073be05-634f-4543-b044-5fe20cf6d1d6
libsdl_gfx: follow stealth update (#36796, maintainer timeout)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@99645 d073be05-634f-4543-b044-5fe20cf6d1d6
PHP 5.3.18 and PHP 5.4.8
Changelog for PHP 5.3.18 and PHP 5.4.8
Release notes for PHP 5.4.8 and PHP 5.3.18
PHP 5.4.8 and PHP 5.3.18 news
Missed archive.xml (thanks hannes)
Redirecting logged in users by baseurl.
Just added some random comment

Ok I'm still actually learning git so
this is nothing substantial.
Added fire() to the spaceship and tapdetector
Libreria para calcular el mayor de los dos numeros
Merge pull request #6 from ercanario/master

lib15
Primer cambio agrego un docstring
Merge github.com:sdelquin/mathdaw
update the notification message to reflect no. of pokes if the user is poked by more than one user
Change: Made .candidate-selections.json file I/O operations asynchronous for faster performance

Signed-off-by: Mehdi Hasan <mhasan@omicronlab.com>
1 Autocorrect entry deleted

Signed-off-by: Mehdi Hasan <mhasan@omicronlab.com>
New Return key behavior: First hit commits text only, subsequents enter new lines.

Should be beneficial for typing on windows/dialog boxes where return key may "apply and close" it, or data entry applications where return key switches focus to next input box.

Might cause irritation for word processing.

Thus, this should be a customizable option.

Signed-off-by: Mehdi Hasan <mhasan@omicronlab.com>
Merge branch 'feature/dictionary-support' of https://github.com/sarim/ibus-avro into feature/dictionary-support

Conflicts:
	main-gjs.js

Signed-off-by: Mehdi Hasan <mhasan@omicronlab.com>
Made few adjustment in the Preference dialog UI (avropref.ui)

Signed-off-by: Mehdi Hasan <mhasan@omicronlab.com>
Merge pull request #25 from omicronlab/feature/dictionary-support

Feature/dictionary support
More documentation added and indentation corrected
Solved 34 problem.
API 추가 및 수정

내일이면 완성!
이제 슬슬 UI...
add global budget
add fixme about implementing slices of builtins
Update comments, minor fix
Reset on spiking visualizer removes current plots
Post-synaptic updates: use weights not axonal delays

Implemented a post-synaptic update scheme. The potential of a spiking
neuron is directly added to the potential of all post-synaptic
neurons.
Use the newer connection oriented update_potential call
Test a simple 2 neuron network with heaviside input
Add architecture flags to makefile build commands
seperated Store Trait from PersistentStore implementation
first commit
Merge branch 'master' of ssh://github.com/scotfu/gezipuzi
inputrc cleanup

- removed unused (commented out) config
- removed useless comments in Slovak
MOHAWK: Allow changing video rates

getVideoDuration now returns an Timestamp
MOHAWK: Implement the Myst boiler movies
MOHAWK: Play the gear closing movie in Myst
MOHAWK: Implement Mechanical fortress rotation

Both the simulation and the actual rotation.
MOHAWK: Play Channelwood stairs door closing movie backwards
MOHAWK: Play Stoneship chest valve opening movie backwards
MOHAWK: Add a workaround for Myst ME fortress rotation bug
MOHAWK: Fix Myst ME's clock tower weight not going back up
MOHAWK: Implement the last two Myst opcodes
MOHAWK: Implement most of Myst's transition system
MOHAWK: The cancel button of Myst's dialog was actually saving
PNG: call png_set_interlace_handling() before calling png_read_update_info()

This matches the documentation, information from the PNG bug tracker and the
behavior of example decoders off the net. It fixes warnings thrown from the PNG
decoder
add incomplete Name example
example usage of ZkFarmer export API
proper use of logging
fix the import path for the export.py example
wait for the zookeeper daemon to be available
zayavka_form
passing conn to connection handler after connecting
added fmt on connection.go
convert codes to be an array rather than a hash since ruby 1.8 hashes are unordered
update the readme
elisp追加
tramp削除
modified:   article/2012-05-13-vimwiki-encode.wiki
	modified:   article/2012-05-13-vimwiki-encode.wiki
Added product add and update functionality
implemented allocatepage() fn
chavar files
zero entire user mem
Support specifying the inputDirectory in code
Initial work on Maven plugin for ANTLR 4
Add Eclipse project files
Initial Maven plugin for ANTLR 4. Just replaced v3 references with v4, so documentation not up-to-date.
Report inputs/outputs during Maven build
tweak unit test
replace ctor for single ctx and don't merge wildcards when payloads aren't the same. fixes a unit test.
add cmt
Merge branch 'antlr4-maven-plugin' of git://github.com/sharwell/antlr4
added -listener and -visitor dependency generation to the command line -depend switch (tool/BuildDependencyGenerator.java); signed contributors.txt file
made changes suggested by Sam and deleted erroneous comment about not generating TLexer.tokens which is no longer true for ANTLR4
Merge pull request #74 from stephengaito/master

Adding -listener and -vistor file dependencies to the -depend command line switch
 updated the comments for SLL.
initial impl
almost there.
let it consume EOF since we sometimes need to match that during prediction
update comment on consume()
Merge branch 'master' into new-conflicting-alts
no debug
I need EOF edges on rule stop states for start rules.
Unify EMPTY_FULL_CTX_INVOKING_STATE and EMPTY_INVOKING_STATE (fixes an array indexing error during closure)
Fix assertion in PredictionContext.mergeArrays
Fix testOptional and testNoViableAltAvoidance
Merge remote-tracking branch 'antlr/master' into non-greedy
Fixes to LexerATNSimulator.closure, fixes to non-greedy positive closure
releasing java client library 1.3.6
added setup activities in AndroidManifest
estilo de total
Merge branch 'master' of https://github.com/shuargan/Tabule
Change panic to error when read one record
Just making the prototype look better with some CSS.
Fix layout
Rename assertion.name to assertion.message
Move stack_trace into its own table
管理アロケータ実装中
冗長なフィールド削除前
Add function to restore windows to their original size/position. Removed polling and configuration for now.
updated simple build script
gem 0.7
Switching to an included Gumdrop install
Merge branch 'included_gumdrop'
parsers can generate multiple row iterators -- one for each table that is detected (e.g., if file is an HTML file with multiple TABLE elements).  Row iterators (called dbtruck.parser.DataIterator) keep track of headers and types metadata
made change on branch feature
Many changes

Many changes as suggested by avantika
Half-finished abstraction of signs.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
Fixed the spam in mechanic manager.
Updated version for next major CraftBook release.
Map Changer Mechanic.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
Improved Combination Lock IC.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
Awesome new Timed Explosion IC.

Signed-off-by: me4502 <mnmiller1@hotmail.com>
starting fresh, doing it 'right'

Lost commit history, but this way I'm not introducing crappy commit
history in RP
Merge pull request #1 from wgjohnson/get_selinux_facts

starting fresh, doing it 'right'
Merge pull request #388 from wgjohnson/devel

Devel: created get_selinux_facts
Merge pull request #387 from skvidal/devel

implement --private-key for ansible - to take pem files as an optional arg
Add state=reloaded
If /usr/share/dict/words does not exist, use cracklib-small to test large output.
Remove call to undefined debug() in module 'user'.

I think when we stopped using stderr for debugging modules because
paramiko didn't like it, many modules used the idiom of defining
a debug function that used standard error. The def's and calls were
removed.

This looks like a stray debug() that didn't get removed and didn't
show up unless you alter a user's groups. If it's hit, 'user' fails
with a global undefined function error.
Arguments to setup module should be json.
Merge pull request #396 from jhoekx/setup-json

Arguments to setup module should be json.
Merge pull request #392 from jhoekx/fix-large-output-test

If /usr/share/dict/words does not exist, use cracklib-small to test larg...
Merge pull request #393 from bradobro/fix_usergroup

0.4 fix, Remove call to undefined debug() in module 'user'
updated connection.py to have the same interface for exec_command on both LocalConnection and ParamikoConnection classes
Merge pull request #402 from denen99/devel

updated connection.py to have the same interface for exec_command on both LocalConnection and ParamikoConnection classes
Fix hosts being in multiple groups, and duplicate host references in the same inventory file.
Merge pull request #391 from cocoy/reload-feature

Feature: Add state=reloaded
dim fetch dest after templating
Merge pull request #411 from mgwilliams/bug-fetch-module

Fetch module: run dwim on dest after templating, not before
template path for handlers: include
Merge pull request #412 from mgwilliams/bug-include-handlers-templating

template path for handlers: include
Allow "=" in k-v values.
Fixed exit on dummy commit
Merge pull request #40 from dmi/fix-timezone-fix

Fixed exit on dummy commit
Refactor planet generation
Assign planet types
Display planet type
Some additional hacking...
Good formatting for posts @ homepage.
Deleted unused plug-ins and themes.
Imported a test post from old blog. Removed dummy comments. Edited home display.
More posts migrated. More actual plug-ins added.
added headerMod for oppKron2Lo
When query is exact project name, fetches the readme.me
Merge branch 'master' of github.com:smailq/Readmegh
Empty files/folders for starters.
Do not try to remove already erased shapes.
Remove eraseIf, eraseAllIf as it doesn't appear to be very useful.
Disabled log-supression in runner, it seems to be causing some logs to not print
Merge pull request #71 from jidar/master

Fixed logs not printing
Update crespoparts gammatunning

This was checking if colorfiles insteed of gammafiles

Change-Id: Ic34f0882235df2b8c307e625944c3a6c517839d3
enable auto binding sequences
Adden attachment type
Quick fix for the attachments.
Merge pull request #2 from michalkos/master

Adden attachment option to the form
The 'test' database already exists on Travis.
change code layout
modify isValid() (add checksum calculation)
modify isValid() for '111111111'
add phone on tuition
more js tidying
Display priority in extension list
readme complété
Add some workarounds for common XML errors created by clients. GH issue #1608
Add IMDB release year searching to newznab API
Reduce memory usage by clearing out the already collected timings when timing is disabled
Clean up SpotSettings, convert comments to English
upping the gem version
removed useless extra.txt
fixed fa regex to include fasta
Fix typo in experiments.
update sseul
getting ready for updates/inserts
omg i can update/insert
spiff up the display a little
Add a reset button
Make NJClient inherit from QObject

In order to take advantage of signals/slots NJClient needs to become a
QObject.  This will allow us to use Net_Connection signals and replace
->Run() with a QTimer in future patches.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Use QTimer instead of ClientRunThread to call NJClient::Run()

ClientRunThread invokes NJClient::Run() every 20 milliseconds and
notifies MainWindow when state changes.  It turns out we can use QTimer
for the timer interval and get rid of the thread!  This makes life
easier because we only access NJClient from the Qt event loop and no
longer need a mutex.

The next step is to push the timer and state change signals down into
NJClient itself so MainWindow does not have to do so much babysitting.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Move client signals and interval timer to NJClient

There is no need for MainWindow to drive NJClient::Run() or to check for
state changes.  NJClient should do these things internally.  Move the
->Run() timer to NJClient and also emit the state change signals
directly from NJClient.

Note that state change signals should really be emitted where the state
change happens instead of by monitoring variables for changes in
NJClient::tick().  This will be fixed later.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Remove MainWindow::RunTick

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Emit NJClient::userInfoChanged() directly

There is no need for a member variable, we can signal userInfoChange()
immediately.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Hook NJClient up to Net_Connection signals

Respond to incoming network messages in an event-driven fashion instead
of relying on ->Run().  By hooking up Net_Connection signals we get
notified immediately when new messages have arrived.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
import the correct names
Allow passing mailer_type and mailer_args separately
use limit
mingw_build : no longer used.
showing name of the user on mouse overview of user icon everywhere.
formating date on observation list page
Merge branch 'master' of github.com:strandls/biodiv
rename wyLines to wyShape, combine wyPoints into it. remove wyPoints
susig
The test_can_update_entries was failing due to the comparison of time fractions, which are possibly lost either by storing or retrieving the time data.
Removing *yml from config and adding to .gitignore.
heap sort and merge sort
Improve sidebar action box formatting
Merge branch 'develop' of github.com:sul-dlss/hydrus into develop
Override signin partials so we have full progressively enhanced login.
Support more file names.
Added download path setting.
Problems with str and unicode conversion after GTK3 use.
These changes set the encoding explicitly, so as to avoid ascii being used


git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19950 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
convert KEY_PRESS


git-svn-id: https://gramps.svn.sourceforge.net/svnroot/gramps/branches/geps@19951 27f82ba3-fc0d-0410-9f6a-8f6d5e09c20a
back to working

I needed to update some class names in razor, etc.  Still needs love
care and attention to get the data to show up in HTML.
(I don't remember what I was trying to do...)
another
another v
add some quotes for good measure

git-svn-id: http://haxe.googlecode.com/svn/trunk@5151 f16182fa-f095-11de-8f43-4547254af6c6
fixed binop after closing parenthesis for conditional compilation (fixed issue #782)

git-svn-id: http://haxe.googlecode.com/svn/trunk@4498 f16182fa-f095-11de-8f43-4547254af6c6
documented

git-svn-id: http://haxe.googlecode.com/svn/trunk@4499 f16182fa-f095-11de-8f43-4547254af6c6
minor

git-svn-id: http://haxe.googlecode.com/svn/trunk@4945 f16182fa-f095-11de-8f43-4547254af6c6
Added boolean[] to default serializers.

git-svn-id: http://kryo.googlecode.com/svn/trunk@257 a9660ef0-a895-11de-8ba5-91705c1537ed
fix: Label2Vol
ENH: Respect user supplied -o -e flags in qsub_args

The qsub_args may have -o and -e flags pre-specified.
If those are explicitly specified by the user, then do
not use the default values.

In addition, the line was broken apart into units that
make it easier to debug. Initially there was an error
stating that the argument to %d is required to be an
integer.  This failure was removed during the refactoring
process.
Merge remote-tracking branch 'upstream/master' into enh/probtrackx2
fix: diffusion imports in slicer
fix: all of stdout captured in subprocess call closes #181
Autogenerate setup.py for slicer
Merge pull request #9 from chrisfilo/fix/slicer

Fix/slicer
Merge pull request #416 from satra/fix/slicer

fix: diffusion imports in slicer
Merge pull request #414 from BRAINSia/bug/FixSGEGraph

ENH: Respect user supplied -o -e flags in qsub_args
Merge pull request #417 from satra/fix/captureoutput

fix: all of stdout captured in subprocess call closes #181
doc: updated changelist to highlight important changes since last release
rf: updated version info across programs
doc: updated release to dev
option to change NaNs to zeros in Maths interfaces
option to change NaNs to zeros in Maths interfaces
option to change NaNs to zeros in Maths interfaces
Cleanup and return abspath.
added missing "exists" parameters, removed extra "other" inputs
Changed AFNI default output type to BRIK/HEAD
Added support for BRIK/HEAD to copyfile
added tokenify function
Story #227 Done
Merge branch 'hotfix/hiderelated'
340.09 Refactoring JSON list handling - most of this should work, now
344.12 Added Otherlab homing changes; updated otherlab, default and sacidu93 profiles for QR switch
journal: support epxorting the journal in a format suitable for text/event-stream
Clarify pin activation: (0,1,2) relevant pins.
Added makeitcount tmuxinator file
reset CDS colour in convertPseudo()
Initial python version of Jarvis
Minor changes for indentation and spaces
IMPORTANT classname changed like other XMPPHP classes and minor changes for indentation and spaces
Refactor for cleaning code and indentation
Refactor for cleaning code and indentation
add_mapping
renames test/shell to test/term
TUI documentation
documentation cleanup
documentation for Module methods
redcarpet docs
update changelog
bump version
Merge branch 'release/2.2.0.0.pre1'
Packaging Optimisation

Fixed packaging type before save conversion when optimisation used
READMEを現状に合わせて更新しました
Merge branch 'develop' of github.com:tengine/tengine into develop
Move out git from plugins
Use neocomplcache instead of supertab
Arquivo Travis
add bank_b.aspx
update
Capitalize assert macros.
Reorganize the configuration
Rename the Twig global variable for the user (app.user > _user)
Add cache system for Loader, Translator nd Routing components to improve performance in production
builder is now working
JSR311 try something with Application.
Phone number display improvements and display time offsets (between user and server) correctly
Keep the display safe if user has not set a timezone
Button styling for number and time, clicks to edit
- new Comparable & Serializable Interface for Content
t alias is conflicting with the t gem
Base changes, installed Composer, registering with Packagist.
Switched from jeweler to bundle gem system
Fixing some ignored file
Removed ARGV reference from class...
Added swp file to ignore
Adding rake to fulfill travis build
Fixed uri parsing
Fixing dep
Added logger gem as dependency and logging using the logger
Added a Cross::Attack:XSS class that handles XSS pattern generation.
A block enabled each() parameter is in place to make able to execute
arbitrary code for a given XSS pattern
Added authentication support for mechanize. Moved option hash in start
method and created an attr_accessor for it
Fixed option hashmap handling
Typo
Added to README.txt
Merge branch 'dev'
Added an error dialog for trying to create a meeting point when not logged in.
Fixed bug
- save tel after edited
Merge remote-tracking branch 'origin/master'
Updated build chain. Pattern rules and c headers in asm files
changed translator output rpn list to QList class

updated CMakeLists.txt to support using Qt;
also required changing the list element pointer in the done stack to a
a rpn item pointer (doesn't need access to list), the list element
pointer in the command stack to an index (needs to know where in the
list to insert tokens), and the list element pointer array in the rpn
item structure to a rpn item pointer array (doesn't need acces to list)
Container.config inline no Web.config
Gui
Merge branch 'master' of ssh://git@github.com:22/tigashy/Risk-AI.git
Source vimrc again after saving it
void-linkset
Year diffs should include the date of the month in the calculation

#238
Diff should take into account utc mode

#261 #267
ru week tests
tr week tests
sl week tests
Merge branches 'timezone-fix', 'trailing-slashes' and 'remove-iconv-warning' into next
Removed 2 unused files
Fixed problem with logging out.. Fixes #5
Delayed reordering availability list for 2 seconds. Not sure it isn't worse

For #7
FIX: It may become an error rarely.
add Mysql::Packet
Mysql::Protocol#read returns Mysql::Packet object.
add C library to retrieve value from packet.
for speed: change Mysql::Field#max_length calculating method.
for speed: encoding
exclude copycopter init file
licensed unter AGPL
cleanup eclipse project file
Merge branch 'development' of https://github.com/tnds/reisebuero
Update PomoPro/res/values-es/strings.xml

closes #6
* e-mail fix
$px->href_self() を追加。
change file name
change file name
use YUI3 reset.css
g:rcom#reuse = g:rcom#method == 'rcom'
g:rcom#r_object_browser = 'str'
Use rcom_vim.R
g:rcom#screen#rterm = executable('Rterm') ? 'Rterm --ess' : 'R'
s:reuse = g:rcom#reuse || !has("gui_running")
g:rcom#screen#rcom_session replaces g:rcom#screen#rcom_args
g:rcom#screen#rcom_sep = 0
Make rcom/screen work also on the terminal
s:Scratch() takes buffer "type" as an argument
rcom#EvaluateInBuffer(): Show the transcript if the transcript buffer is visible or when running vim as server
Highlight debugged functions
rcom#Debug(fn): Toggle the debug status
docs
some stuff
merge ugis stuff
Set default S3 region to EU.