labofsahil/github-event-dataset-2012 huggingface dataset:
cleaned up the tests some
beta
small changes
build 1003
fix bugs in review list
fix warnings
organized necessary files into client and server folders
Allow the server to specify the wait time.
Add ability to specify hostname and port for PingsClient.
debug code update.
ignore test that require oracle client libs
Make the web REPL work on windows
Adicionado novo formato de frontend para o slide home
Adicionado comentario sobre o tipo do slide
Adicinado slide de texto para nova versao de frontend
Adicionado label na select de tipo de slide para indicar o arquivo de template
Removido o jquery que adiciona funcionalidade de videos e fotos no slide (TODO)
Adicionado slide news no novo formato de front-end
Alterado index para o novo formato de front end
Adicionado comentario sobre o tipo do slide slide-news (4)
Adicionado novas notas e formatado texto
Removed some dubugging
Getting session info into socket.io
Merge branch 'master' of github.com:lopatin/McList
Readme Edit #1
auto-generate help tags for new vim bundles
Merge remote-tracking branch 'github'
changed variable names, ensure strong typing
Minor change.
More minor changes.
agregada funcion auxiliar solo para mostrar valores en el dashboard
[OSX] setup.py compiler args to use "libc++"

clang++ on OS X needs to use the C++11 standard library that ships with XCode.
Add instructions about libc++ to INSTALL.rst
only add libc++ to args if on a mac
Merge pull request #7 from zahanm/master

Use "libc++" as stdlib for C++11 compilation
everything is under control. keep calm. please.
0921-3
Merge branch 'bugfix-926' into bufgix-djbns
Write a new class DjbDNS with properly php-doc, sanitization and improvement of error logs messages. Also fix project issue bug #797 (Reopened)
Merge pull request #32 from shakaran/bufgix-djbns

Bufgix djbns
subiendo version beta del index
Tweaked manage.py to run python3
Add Vector::InsertAt(), Vector::IsEmpty() and Vector::FindFirstIndexOf().
Initial upload of the service management tool.
Particle system

MInor addition
Added password to users
Working pre-set image
change default tenant to admin
Merge pull request #9 from rackerjoe/master

change default tenant id to admin
Merge pull request #8 from mancdaz/master

fix formatting in readme
logging verbosity/clarity
Globals are now cleared when a new spreadsheet is created or opened
adding epers_wakeup
Merge pull request #4 from maretard/master

Web frontend skeleton tied in with Core
RConn 001 commit

Implemented basic datastructures and encoding/decoding logic.
Merge branch 'master' of https://github.com/Pure-Battlefield/gswat
Implemented CommLayer v1

Currently logs in w/ plaintext password.
Passes chat events to waiting consumers.
Merge branch 'master' of https://github.com/Pure-Battlefield/gswat
Merge pull request #5 from maretard/master

Basic Javascript refresh functionality
Hooked up non mock comm layer w/ frontend

Also slightly changed the threading methodology.
Updated .gitignore
Removed extraneous auto-generated files from repo.
Will this work?
Merge pull request #6 from mamidon/master

Hooked up comm layer with web frontend
Merge branch 'master' of https://github.com/Pure-Battlefield/gswat

Conflicts:
	WebFrontend/Global.asax.cs
Code cleanup, queue/tablestore, message types
Created user profile
Added 404 and 500 and cleaned up layout
Added Post class, built post creation. Done With chapter 7.
Integrate FrogrPictureUploader into FrogrController.

This helps reduce the global code base while, at the same time, helps
simplify the whole process by avoiding passing too many callbacks
around and keeping all the stuff related to FspSession in one place.
Renamed FrogrPictureLoader to FrogrFileLoader.

One day frogr will also load / upload other kind of media (e.g. videos).
Replace callbacks in FrogrFileLoader with signals, to be used from the controller.
Remove unused signals from FrogrController
Don't give up on upload too early and retry some times instead.

This might be useful for flaky connections or for temporary
problems in the server side of the communication.
Removed textual feedback on minor operations (setting license, adding to sets...)

This is a previous step to make all those operations work in paralell.
Make after-upload operations work in paralell.

These currently are setting the license, setting the location, adding
a picture to sets and adding a picture to groups.
Fixed memory and reference handling issues, related to how objects and lists of objects
were being passing around among the main window, dialogs and the controller.
Removed unused flags in FrogrController
Refactor finishing the upload of one picture and fix a leak
Renamed private variable
Don't perform after-upload operations on idle.

Those operations work now in paralell and are already asynchronous,
so there's no point on running them when idle.
Add extra ref to GCancellable in the right place
Make after-upload operations cancellable
Refactor code for adding pictures to sets / groups
Make after-upload operations repeatable.

Still some refactor is probably needed, plus a smarter way of deciding when
to repeat or not other than just if "it's not been cancelled"
Use the same const MAX_ATTEMPTS for different situations
Add new helper function _should_retry_operation()
Properly detect & report errors during after-upload operations.
Added missing null check
Allow deletion of videos in playlist.
Changed redis data structure to be more efficient.
Testing ignore ares with fixed values. Still a bit buggy with vars here!
qDebugs inserted. Error found: laserScannerFrontIgnore… values are 0!
Ignore area values updated in ini-file
Updated const from show int to int
Bug fixed: ignore areas now read successful. But concept still buggy.
Moved init of class members.
Debug messages removed.
Color added to message for log
Complete merge from branch 'completeNewLaserLineCheck' using strategy 'theirs'
Connected log file messages signal from obstacle check thread to writeLogfile
Updated laser distance in ini-file to old value (60 cm)
Updated laser lines colors in GUI.
obstacle = dark red
free way = dark green
preferred driving direction = blue
center of driving direction = yellow
Unchanged:
ignore area = dark yellow
background = black
Updated comments and comment markers
Removed old unused code
Disabled qDebug line
Fixed angle check, when everything is 'free'. Works fine so far.
Updated laser line colors (to old values)
Bug fixed: Added missing check for robotSlotWidth.
Works fine in sim mode.
Simulation values updated (laser lines)
Removed old "robotSlot" stuff. Only using robotSlotWidth now.
Serial port for Linux fixed in ini-file
Set to /dev/ttyARMBoard
Laser distance updated to 70 cm in ini-file
Initial check-in
Ou browser - initial
UserName builder - improvement (limit length)
Tonights changes (...umm)

- Initial config
- Initial Manifest
- Test UI (view datatable)
- Script UI initial
- OU update - WIP
- Match update
- Main updates - still WIP
- etc, etc, etc
more markup tweaks
Now available in French
replace a Map with a IntMap in BKTree
Merge pull request #120 from pocketberserker/replace-bktree

Replace a Map with a IntMap in BKTree
Move IntMap monoid to a Monoid type.
Add generic checkMonoid laws.
Add string monoid
Test monoid laws
Removing the dependency between  and TypeProviders.Freebase.DesignTime.dll - relates to issue #123
Don't create AssemblyVersion files for the Freebase provider. This doesn't work with the portable profile. - relates to issue #123
Build a portable version of the Freebase provider - closes issue #123
Build a portable version of the Freebase provider - closes issue #123
Fix reference to PowerPack
added BinomialHeap data structure
Merge pull request #127 from jackfoxy/master

added BinomialHeap data structure
Remove superfluous Option.liftM
Ikonki kategorii
Updates to hook up the tab controls

This is all working, but it's ugly, so I am going to tinker with
PSMTabBar, which looks a lot more promising.
Embedded code must be aligned to left
better description for new file names
more verbiage around creating new files
Fix xib path.
modif js/html/css
Adding tree map to visualize business unit in a tree map
Update @since tags from 1.20 to 1.21

Change-Id: Iea7bad4367782ee8baa676921625b44dc2b7c45f
Localisation updates from http://translatewiki.net.

Change-Id: Icef5d6502611b01298f5a8f66ea4ce25979ac6c0
Merge "Localisation updates from http://translatewiki.net."
deadbeef-9999: some fixes
added musicroxx
insert faye for realtime messages and updating of overview sessions
Compacted declarations
Functional; only modifies 1 target though
Finished
Post-handin update
set to utf-8
with stopping exec queue, mdadm will not be able to create RAID array
add upstart conf file for unicorn
Tell unicorn where to find current Gemfile
Merge pull request #201 from messick/unicorn_template_fixes

Unicorn Template Fixes
Merge pull request #200 from messick/raid_patch_1

without disabling udev events, mdadm will not be able to create RAID array
Use current_path vs Rubber.root for Unicorn stuff.
Merge pull request #202 from messick/unicorn_template_fixes

My last pull request had an issue.
Comments list is added
Added TODO in testing.
Added ability to create a gist

Added ability to create a gist, as like this
http://developer.github.com/v3/gists/#create-a-gist

https://github.com/michael/github/issues/17
Merge pull request #27 from coderaiser/patch-2

Added ability to create a gist
Remove not used variable DATA_NODE_FETCH_SIZE in execRemote.c
The function is_foreign_expr() and pgxc_is_query_shippable() were using
different walkers to checking if an expression or a query respectively, is
shippable. The logic to decide whether an expression or query is shippable or
not needs to be same except for few differences between shippability of
expression and query, arising from the information in both of them. If we want
to code a rule for shippability, we need to make it to both of these functions,
becoming a maintenance burden. The commit unifies the walkers into one and makes
appropriate changes in naming.
Merge branch 'master' into remotecopy

Conflicts:
	src/backend/commands/copy.c
Merge branch 'remotecopy' into altertable2
ticket:6 more reliable JS event logic
Fixed bug in submission manager
Added "getElapsed" function to return the elapsed time in seconds.
controller checks now follow directory structure and file names
centrer le logo de la newsletter
alignement des top links
alignement des top links
use zsh-completions
touch .zshenv.local
playing with TabPanel
Change nzbmatrix from http: to https: for so nzb request packets are not in clear text.
Implement Pushover notification support.

As mentioned in https://github.com/rembo10/headphones/issues/888
Only added the configuration to the default user interface.
This was mostly copy/pasted from the Prowl notifications.
Prevent double-processing of downloads when the SabNzbd and Torrent download directories are the same.
change http to https for search.py as well
Merge remote-tracking branch 'chomp-/develop' into develop
Merge remote-tracking branch 'brycied00d/Pushover' into develop
Merge remote-tracking branch 'brycied00d/DownloadDirFix' into develop
Merging in the changes from the develop branch now to get the xbmc
update (plus some other features/bug fixes). Performance fix coming in
the next update
Fix for post processor hanging when doing a forced post process and a match is found based on folder name
Merge branch 'postprocessor-hotfix' into develop
Merge branch 'postprocessor-hotfix'
rutracker website title change

rutracker website title change
Merge pull request #941 from AdeHub/master

rutracker website title change
Merge branch 'master' into develop
Fix unicode path handling and improve exception logging

Prior to this patch, on Windows, files had their paths and filenames decoded,
which resulted in e.g. "C₁₂H₂₂O₁₁" becoming "C12H22O11" when opened by
MediaFile().  CP1252 is really a rather terrible codepage so I also added it to the
poorly configured list.

I also noticed that when the directory is unicode already but not appended,
it was getting re-encoded before walking, then later decoded for
unicode_song_path, so I made sure both are checking to see if the string is
already UTF-8.

Additionally, the log line when a file can't be opened or processed now
includes the text of the exception.  This greatly enhanced debugging this
issue and also helped me find a bunch of corrupted songs, so it's worth
keeping.

Needs testing on other platforms.
Fix indentation bug

silly me.
No longer convert file names and paths to byestrings.

This patch forces headphones to use Unicode when dealing with file names.
Python's Unicode HOWTO says[1] that if you provide Unicode path and file
names to ```os.walk``` and friends, they will transparently convert file
names and paths to and from Unicode.

This code needs further testing as I only have access to systems that use
MBCS (Windows) and UTF-8 (Linux, OSX.)  It works fine here, particularly
on Japanese and Korean filenames.  I also do not currently have access to
non-UTF-8 terminals to test the logger output.

[1] http://docs.python.org/2/howto/unicode.html#unicode-filenames
Don't send job to hgpusher if patchset invalid.
Fix some typos and config errors.
Don't checkout a working copy in clean repo.
Fixed parsing of # and on to fit actual usage.
No message
Added the most recently eaten token to parsing errors that end on a line, so there's something to highlight.
Update new images to less rubbish versions.
models.Tag: extended char limit on name to 2047
fix knx_init, knx_cache
Merge branch 'knx_init'
pengwin html
pengwin html r2
pengwin html r3
added assets
Add a pkgconfig file for uninstalled builds

This allows systems certain types of build setups to work. Specifically, this
will help when building on Android and using json-c as a dependency for another
package.
Run configure in the autogen.sh script

This is convention in most open source projects.
Add an Android-friendly build system

This dependson the Androgenizer project, which helps keep autofoo-based build
systems in sync with the Android build.
Merge pull request #33 from mloskot/master

Added a bunch of missing HAVE_* defines
Remove unnecessary comment from json_util.c
Fix git commands for tagging a release.
Add json_object_iterator.h to installed headers.
Merge pull request #26 from ford-prefect/master

Android build system
facebook and avatar fix
Merge pull request #142 from matevzmihalic/fbfixvol11

Facebook Fix (team 1)
past query in input tag
Fix JS past query
Merge pull request #144 from Domen91/issue115-5

Add string for query search, #86
Corrected bug in registration form.
Corrected condition.
Changed condition.
Removed spaces.
Merge pull request #145 from mmiha/issue-143

Pull request for issue #143 #team2
Lazy @Inject (proxy class), issue #2
Unresolved "use"
adjusts how the phantomjs bin path is overridden.
added session.vim settings
Updated Readme.md to reflect Vote F*cker
Add some colors to README.

Signed-off-by: chatgris <jboyer@af83.com>
Merge pull request #35 from chatgris/readme

Add some colors to README.
glib: add missing lock statements for Objects collection

When accessing the static Objects collection in GLib.Object
class, a lock was held in some places but not all of them.
Brought up by Alan McGovern.

Signed-off-by: Bertrand Lorentz <bertrand.lorentz@gmail.com>
change models from ActiveRecord to Mongoid Documents and add field declarations
my first commit
Merge branch 'master' of github.com:moosazero/blog
Add everything.  I've lost track of things and I don't want to delete something important.
remove .cm folder
Works with OfsWorkload
Bumped version to 1.1.1 and added credit to nikipore for binary support
[t1669] fixed animation prefix
Adding in an initial commit for the two game jams
Merge pull request #92 from rossbruniges/event-migration

Adding in an initial commit for the two game jams
Fetches pdf data in the worker
Fixes unit tests and adds few for util.js
Cleanup: removing main thread loading fallback code
Merge branch 'master' of git://github.com/mozilla/pdf.js.git into loadpdf-1

Conflicts:
	src/api.js
Fixes merge with 1849
removes expandUrl(url); fixes error message
Merge pull request #1840 from yurydelendik/loadpdf-1

Moves loading of the binary PDF data to the worker
grr last commit didn't pick up disqus_url change for some reason
Merge in from ryanpitts search branch to resolve conflict
Merge branch 'development' of github.com:mozilla/source into development
Merge pull request #23 from rossbruniges/development

Merge in from rossbruniges/development - which contains fixed conflict from ryanpitts/search
Oops, moved asset compression to udpate()
modifications in undertime computation
excess computation
clustering routine first commit
update layout.html
cosmetics
delete permanode from ui

Change-Id: I7097e4a5dc893a212c91dff987ad7e505793fda9
wip on the tests for deleting a perm

Change-Id: Id6fb34b0d7e79c9eab25bb12b1bb8e240ba70977
Frontend is now officially separated from psiod backend.
Added CppLinq.Mini in order to be able to detect if just using a bare minimum of cpplinq adds any cost in terms of binary size or compile time
Updated .gitignore
Merge ..\..\CodePlex\cpplinq
combine sift and groupby
Update music.manifest and bump GAE version to 48
Fix .panel (fallback) background color in a few places. (Thanks to eslindsey!)  This is why we need to use LESS....
Set backButton href to Referer if available.
Fix reference to Referer (headers.Referer) improve formatting
Correctly handle form inputs with names of "action" or "method" - Issue #94
Fix issues with input[type='submit'] elements in dialogs and panels (for Issue #332)
Add "submit" event listener to default all forms to Ajax submit (final? part of Issue #332), don't directly set form.onsubmit and form.onclick (Issue #59)
Update form-test.html for testing Issue #332
Call showForm() in updatePage even when target is set.  (Issue #332, continued)
Use HTML5 DOCTYPE
Add definition list (dl) extension CSS and test document
Update GAE appname/version to match latest push to stage.iui-js.org
Merge branch 'msgilligan-form-submit-issue332'
Fix label/input overlap bug in dialog box (cherry pick from Remi http://code.google.com/r/remigrumeau-iui-dev/source/detail?r=f0481e4af0e79100ab62f1304f07d5e6cfdc614e)
Bring the dialog feed label up two pixels to align better with the input
Provide links to website and getting-started.html
Bump GAE and Gradle plugin versions, add jvmFlags to work around GAE problem with latest JDK.  Still needs more work...
Change SVN->Git in a comment.
Change reference to Mercurial to now refer to Git
Don't filter while copying binary files.  Echo ant and JVM version on startup.
Code-tidy
Fixed left-hand side of app test
No XML Spring MVC config
updated search doc
monsters anims ok + hero
Added LdAddr lowering
Asm: Instruction defs corrected. BT: simple arithm lowering added
apkg: implemented APKG_DATA_DIR and APKG_INIT env checking
apkg: now prints a nice stack trace when shit happens
apkg: implemented formal verification of C part. Use run_tests.sh to run the tests
GUIDE: Every C bit of code MUST be covered with a test
apkg: fixed formatting
Repaired returning levels from LevelController
totally useless commit
Update .travis.yml

remove env var, is not needed
milestone: Make state property changeable by user.

State of milestone is NOT defined by states of issues anymore.
Fixed Update Account, List, and Page Tab Bugs
Changed footer URL to photocake.info
working on local adaptor, and generic sandbox implementation
Racket >> Scheme
Racket >> Scheme
use geoip-static until geoip can be compiled on freebsd
make style target depend on astyle in PATH
первые намёки на интерфейс
forgot a wire
Open media files in default model
compute_Wmin() function added. Randoms for Lya and Lyb detected lines added. Other minor tweaks.
Change use of 'ls bin/*' to 'test -d bin' for detecting ~/bin/
Use 'case/esac' instead of a pile of if statements for handling
subcommands.
Fix some formatting, add an invalid command message befor eusage
Use basename on -bash
More formatting changes
Merge pull request #1 from smkellyz/master

Updated the client script
alice was vocoding to get ...
Added drag effect on message div
NXP-9230: Caches ConverterCheckResult for each MIME type it supports.
Merge pull request #5 from fdgonthier/NXP-9230

NXP-9230: Caches ConverterCheckResult for each MIME type it supports.
NXP-9144: Correctly add hide button
NXP-9039: cosmits + use generic action template for actions inside the 'more' menu
NXP-9076: add locked state tooltip displaying lock intel
NXP-9076: add action filter condition related to restore version action
NXP-9351: Add a class on selected item in RichFaces tree
NXP-9076: cosmit
NXP-9360: add mustache.js script
NXP-9039: fixing selenium tests...
having test.cpp amended.
fix nodeboxes
fix canvas orientation
add canvasnode handling
remove palette and canvas from inv when used
Small name fix.
React to playlists being clicked.
test for > 50 and 40
test sucess
refactoring
test and code for 100
new tests
success
implement channel topics
Update README.md

Freenode
Get rid of "supports-transactions" and replace with more general "get-features" function
GML and GraphML loading and writing.
Merge pull request #17 from okcwest/io

Graph serialization and reading GML and GraphML formats.
sublime line ending
RPM spec for Fedora 17
Starting xcode + git
Javascript scripts added
Don't use chunked encoding for http:request() in nodejs hostenv... some apis (like github) don't take chunked encoding
Tweaked the wording of some field description to make more clear as to the functionality they control.
some file uploading functions
Update examples.
Big readme update.
Update to Opal 0.3.27
Add instruction about development
fixup! Update
Use latest node
Add rake tasks to build opal js files and to run specs
fixup! Update
Create the tmp dir from scm and ignore its contents
Add rake to the bundle
Require bundler when using rake
fixup! Add rake
Update rspec
Refactor opal.js

- keep Ruby (Opal) stuff in the nodejs GLOBAL scope
- simplify the .rb/.opal extension compiler
Update specs and let them match the name of the watched file
Add testing instructions to the README
Update examples
Bump version
Misc. fixes for package.json, and bump version
Merge commit 'v0.3.1'
Update travis config
Reorganizing FPGAThread to parallel IntanThread
Alterando o settings a ser usado pelo manage
Alterando configurações para servidor de desenvolvimento
Filtrando arquivos temporários
Alterando template do settings local
Update notes for submitted changes

* update tox.ini to pep8 latest (1.3.4)
Update notes for submitted changes

* Add debug output to RamFilter
Update notes for submitted changes

* Allow sitepackages on jenkins.
Make live_migration a first-class compute API.

* Move the trivial implementation from admin_actions to compute.api
* Remove the dependency to scheduler from admin_actions
* Add check_instance_state like all other compute APIs to prevent
undesirable behavior

Change-Id: Ib5176718eae624de982f641bf3ec201fc7b4efcc
Merge "Make live_migration a first-class compute API."
Update notes for submitted changes

* Sync RPC logging-related bits from oslo
Add keystoneclient to pip-requires

As of I788300449e37ba1732f6482ebce5f480a2c14a41, we pull the auth_token
middleware from keystoneclient. (added to keystoneclient in version 0.2.0)

Change-Id: Ide0d562d96e5e426f9c7e532251efd57a0964f11
Merge "Add keystoneclient to pip-requires"
Update notes for submitted changes

* update python-quantumclient dependency to >=2.0
Optional timeout for servers stuck in build

Fixes bug 994786

Change-Id: Iae86c002073f45b48acde8eae07f9b0f62488f90
Merge "Optional timeout for servers stuck in build"
Eliminates simultaneous schedule race.

Keeps host state in memory so multiple schedule attempts use the
up-to-date values that may have been modified by another greenthread.

Fixes bug 1073956

Change-Id: I69fdd9b46bde6b7408c501c42a6ef3b6dd92bbc2
Merge "Eliminates simultaneous schedule race."
Refactored: made internal classes package-private
Add new user and planets to a running server.
Add new planet systems to canvas.
Filled up readme.
uuhj
store notes by UUID
Levels and Audio
Merge branch 'master' of https://github.com/oshoham/RPFOD2
implemented "add" and "list" features of autojoin
commands now pay attention to access levels
Adding registration feature
Some tweaks on the Language and Message class
Minor template and function changes
added support fot asynchronous compilation
Lab2 R1 works well
[WIP] Highlight Separator while drag'n'drop
Parsec が用意してる digit とか使おう
コンテキストの id は symbol と同じ文字列のほうが混乱しなくてよさそう
floatのパーサすこし直した
数字のパーサを整えた
WIP new markup
git-ls-branch-times.

% git-ls-branch-times

  latest    branch                          commits  changed
----------  ------                          -------  -------
2012-04-28  apr27-kryo                            1   7 files changed
2012-04-26  apr26-constpool                       6   8 files changed
2012-04-25  apr24-checkin                         1   1 file changed
2012-04-24  apr23-JvmClassInfo                    2   6 files changed
2012-04-22  apr22-mkMonoLazyType                  1   3 files changed
2012-04-21  apr20-reflect-reorg                   2   99 files changed
2012-04-20  apr19-clone-global-saved              3   5 files changed
2012-04-20  apr19-clone-global                   13   7 files changed
2012-04-18  apr18-typehistory-flags               3   6 files changed
[etc]
git-n-days-ago
Making pullreqs work for things which aren't scala.

% pullreqs
 14  2011-12-07  jsuereth         First cut at debian packaging.
 19  2012-02-21  djspiewak        Respect JAVA_HOME over the PATH configuration (if JAVA_HOME
 23  2012-05-07  leedm777         Fixed group-id for sbt-0.11.3.
 24  2012-05-07  retronym         Handle SBT 0.11.3
Avoid compiling the demo project in the library on iOS
reload page at end of game
refactored html parsing
Removing Jquery from all pages
Adding in temporary navigation on homepage.
fixed the dumbass indentation
On second thought, let's not make Updater. It is a silly thing.
Flock is now an explicit dependency of Yapp, since it's about to take over Source handling
Tiny bugs I fixed on Vitogo
This is kind of important for having /admin work
make the memory formatting options accessible
Started adding stuff for Sources to be totally handled by Flock
Added documentation for handling GET and POST params.
Conditionally compile RKDotNetDateFormatter.h for iOS > 4.0 and OS X > 10.6. fixes #378, refs #568
Use runtime checks for NSOrderedSet class to enable building against iOS 4.x and OS X 10.6. fixes #568, #545
Remove extra release
Working
Merge branch 'master' of https://github.com/pfynan/engr307

Conflicts:
	Matlab/compexp.m
	Matlab/decodeDTMFSignal.m
cmake installer code for clhep, unused but ready to.
New package removal method, with extra env file removal for packages that require it. Partially completes #68.
Better package removal and -p progress or update mode.
Updating packages, closes #69 and closes #68.
滚动效果
Source the git-prompt file.
Using HTML chars for < and >.
small styling fix header selection in fullscreen
Fog of war, woo
Merge branch 'master' of https://github.com/phulin/mazular
clenaup, replacing console.php on yii install
Compiled.
libopenglmm Added Windows version of creating an OpenGL 3 context.
nu kan man typ söka pallar
Small changes.

Apologies for terrible description, rushing.
Implemented directory tree traversal and MD5 checksum computation.
Cosas básicas para empezar

se me olvidó el views.py :P
new serialize mailet
#34 Added percent complete view
implemented get drivingdistance
Rename operation
Some fixes in oauth stuff
import added
Some examples
make sure to cast to int when indexing maps too
[doc] import from main parltrack documented
[fix] crawler stops at end of list
[enh] moved legal_basis truncation, sorted committee dossiers
[enh] truncating legal-basis
Added a user type, a simple scheme of privileges for the moment.
* AppConfig.cs: Implemented a granular permission checking API. Even
  if our database is not granular, we prepare for such a requirement.

* MainWindow.cs: Deactivate some of the UI elements depending on the
  user's capabilities.
Removed commented code and the now unneeded charp private member.
Added a simple user authorization scheme for now, by levels and a Remote Procedure so the user's client knows what actions it can perform.
Various fixes
Fix emits annotation
Fix license year
added Wiimote libs
show recent features in readme
all tests pass. Yay
LOGBACK-767 setting context
Class Room
Adding TPCH creation scripts
Tidy my vim configuration
Added initial Brute implementation. Added collinear files.
added timestamps to let us know when the request is sent/received (created_at) and when it is accepted/rejected (updated_at)
new icon
new icon 2.0
US2427: Broker add / change plan REST API
fix for cartridge-jenkins_build.feature cucumber test
Merge pull request #232 from lnader/master

US2427: Broker add / change plan REST API
Merge pull request #240 from abhgupta/abhgupta-dev

fix for cartridge-jenkins_build.feature cucumber test
Fixes for bugz 840030 - Apache blocks access to /icons. Remove these as
mod_autoindex has now been turned OFF (see bugz 785050 for more details).
Refatoração Exame Clinico
refactored ExecutionPlan
moved ExecutionPlan to the .framework package
Refined
Leave this file unchanged please
Remove flush()
fixed the path to bundle/ir_black
Remove some qDebug/dead/unused code
avoid suppressing missing database.php error
avoid layout errors with invalid db config

closes #237
add note to create database prior to installation

ref: #250
remove obsolete AppError file

In cakephp 2.x cakeError() has been removed, and croogo now uses
a custom Controller/CakeErrorController as exception handler.
setFlash error messages are not displayed

closes #250
Merge branch '1.4-errors' into 1.4
Update View/Attachments/admin_browse.ctp

Allow the title and description to pass to tinyMCE
Update Plugin/Tinymce/View/Helper/TinymceHelper.php

Allow Node title and Description to pass in (coupled with change to Attachemnt/admin_browse)
thickbox: fix incompatiblility with recent jquery

see https://gist.github.com/3956574 for history of changes in the original file
note: this is thickbox 3.1 minified with uglifyjs.
Merge branch 'master' of git://github.com/thoth/croogo
avoid getting 'undefined' as title or description
adding space between '.' operator
use composer from PATH when available
detect installation errors and inform user
set minimum-stability to dev
Changing instrument works
Remove cutest dependency
Simplify timeout test
fix typo s/_state/state
Merge pull request #1164 from baijum/state_typo

fix typo s/_state/state
Fix typo
Fix typo
Merge pull request #1165 from msabramo/patch-1

Fix typo
Merge pull request #1166 from msabramo/patch-2

Fix typo
Update salt/modules/django.py
Merge pull request #1167 from msabramo/patch-3

Update salt/modules/django.py
we use single quotes
Add django to index list
Add django module rst
define abstract methods for file client

Force implementation to create methods by raising
NotImplementedError exception
Merge pull request #1171 from baijum/fileclient_abstract_methods

define abstract methods for file client
Serialization of payload was not calling 'loads'
Merge pull request #1172 from baijum/payload_minion_mainloop

Serialization of payload was not calling 'loads'
Teach pip.py about Fedora-derived naming

System pip is located at /usr/bin/pip-python
if installed from the python-pip package. This
affects at least Fedora, RedHat, CentOS,
Scientific, possibly other derived systems.
Merge pull request #1173 from emidln/develop

Teach pip.py about Fedora-derived naming
Add which_exec function to utils
Add which_bin to cmd module
Merge branch 'develop' of github.com:saltstack/salt into develop
truco css
Adding specs for PIR IQ merging. The deployment shows now if the link has a merged pdf or not. pdftk binary is checked at boot time
project copied
Split test case to workaround incomplete error report.

Reporting some errors prevents reporting others. This
residual issue had been lodged as SI-6758.
Question now extends from FacebookType.
Fix for #177 (apprequests) - added AppRequest type.
Add support for PrivateIpAddress parameter with RunInstances
ver. 0.7.0.0
styled about page for 3 column about section
updated at 2012年 6月14日 木曜日 03時13分50秒 JST
Merge branch 'master' of github.com:rhysd/dotfiles
updated at 2012年 6月14日 木曜日 03時24分11秒 JST
Update src/ZfcUser/Controller/UserController.php

Can't change e-mail or password if your not logged in.
Add a Procfile for heroku deployment
Added CNAME file for custom dns
Progress meter and improved distance computation

* Added a progress meter
* The distance computation does not require the computation of W*H which drastically
reduces space requirements. This makes the algo actually useful for sparse matricies.
push for colin
Add a simple AST module, rename some things, fix up support for
structs and the list, set types.
add bucket to layer model
do not include test module in coverage, only main code
model.Layer: remove add_buckets method which is unused
New svg files added
Fixed typo in docs
Fixed #12460 -- Improved inspectdb handling of special field names

Thanks mihail lukin for the report and elijahr and kgibula for their
work on the patch.
Fixed #18843 -- Replaced more special chars in column names (inspectdb)

Thanks airstrike for the report.
Modified docs about SpatiaLite version that doesn't need manual initial SQL file loading as per 675431dfaaa.
Merge pull request #301 from carlospalol/quickfix/blog-post-typo

Fixed typo in docs
Fixed #18847 - Updated for media examples to use static.example.com. Thanks Jamie Curle.
Cleaned up the implementation of in_bulk
Common:

* Audit _is_ functions and make sure they return and filter correctly.
* Add descriptions to phpdoc headers of common files.

git-svn-id: http://bbpress.svn.wordpress.org/branches/plugin@3902 9866e705-20ec-0310-96e7-cbb4277adcfb
Update google-diff-match-patch to 20121119 snapshot
Remove jsinc dependency
Use require() directly instead of going through jsinc
Convert test.js to UNIX line endings to match rest of repo
Add an assert to test.js
Add test script to package.json
Add a dump of the exports to the tests, to verify the exports are clean
Ensure test collection is larger than per-page
- Fleshed out uncertain data references dock window with proper 'source code' column contents.
- Code and data reference dock windows now have token context menus.
- Code and data reference dock windows now allow multiple rows selected at the same time.
- Code and data reference dock windows scroll disassembly view to reference address if return key is pressed on a row.
Added ufw to the repo
Interpolation test file
dodano izdavanje, modificirano servisiranje
edit application implemented
updated some error messages, fixed stylistic issues.
Merge branch 'master' of github.com:ropensci/rgbif
Do some more updates to the .gitignore file
Delimiter multiple characters explanation
don't need to call texi2dvi explicitly in Makefile, plus it doesn't work in Windows

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@70209 bc3139a8-67e5-0310-9ffc-ced21a209358
merge with collab branch containing fix for dqrls and bug-fix for computeRBaf that can misalign sample index with batch index (when batch is not in alphabetical order)

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@71295 bc3139a8-67e5-0310-9ffc-ced21a209358
Updated TUTORIAL to show how to use on() with a where().
Integrated AnnotateIt for testing purposes
Cleanup
home version.
merge home and 97 version.
fix checkstyle things
add include guards and beginnings of commandline parsing
add missing include guards, add platform specific header
changed from emp.setEmployeeRole(user.getRole().getRoleName()) to emp.setEmployeeRole(user.getRole());
Merge branch 'master' of github.com:rvishnu/RSPWeb
add hibernate xml and spring properties files and required images
bundle exec rake commands
Fix element-scoped selector bug

Make sure scoped by element, eg. li.links or h1#site-header are highligted.
Pointing worker-pool and terminal to personal copies until pull requests are handled
More errno changes
Removing usage of require.paths
TTY changes
Added ECONREFUSED to a test regex
Updated swiz def formats
truncated long lines
config register.
more tests for the flash message
requisite_in statements work!
adding check to bypass kvm on FreeBSD
Merge pull request #989 from cedwards/develop

adding check to bypass kvm on FreeBSD
Created a RunnerClient class and altered Runner to use it instead

Refs #2198
Merge pull request #2199 from whiteinge/salt-runnerclient

Created a RunnerClient class and altered Runner to use it instead
Added actual link to Troubleshooting index.rst file
Updated link with the corrected restructured syntax
Merge pull request #1313 from thehoule/documentation

Added actual link to Troubleshooting index.rst file
code blocks need to be indented
Edit and delete events.
Timeline events are now all in blue and more function is implemented.
Edit motto, current motto is now the default value.
Merge branch 'master' of https://github.com/sammuell/weact
Removed log guards, as usage of logback API makes them redundant.
added video, button, and mobile stuff
Add FollowCam, an easing Camera.

It's so easy to make this that it's questionable whether we should
include it.
Merge pull request #1 from saroele/master

(update)
Merge pull request #2 from saroele/master

pull saroeles' clean-up
smooth function
Revert "smooth function"

This reverts commit b5bd3397dc8bcaaade3235e29d86b57284d5b7b0.
Merge pull request #4 from saroele/master

renew pull request without smooth( ) commit
smooth function in Result
Merge pull request #5 from saroele/master

awesim
smooth( ) function
Merge pull request #7 from saroele/master

pull of saroele
smooth function
Merge branch 'master' of https://github.com/rubenbaetens/awesim
Merge branch 'master' of https://github.com/saroele/awesim
trace( )
Merge pull request #8 from saroele/master

update( )
Merge pull request #18 from rubenbaetens/master

merge smooth into the main branch
it's not flat
Removed lots of unused resources
Removed one round of strings
String removal round 2
String removal round 3
String removal round 4
String removal round 5
String removal round 6
String removal round 7
String removal round 8
String removal round 9
String removal round 10
Removed more unused resources
Restore the DLG_more string
Merge remote-tracking branch 'origin/120927_sb_remove_unused_resources'
Updated .po and .pot files
Updating mepgen.text.text successors_to_automaton to include generation of ranges.
updated release date for 2.0.2-rc3
minor fix; header comment referred to wrong filename
add modal-view, supports event publication
Update documentation for VModal
Merge branch 'modal-view' into wdat2-develop
release 0.7.0; implements modal window view
Merge branch 'release0.7.0' into wdat2-develop
Kapitel 11 fertig
Updated demo HTML pages
Merge branch 'gh-pages' of github.com:schindld/jqwet into gh-pages
Added trk aliases and a line to force xterm-256color
Start with 4500th image for parallel processing
added in more functions to Node
first 
n
s
包名换
s
Removed login.py
Rewrite as now workds in prospect fields
First approach to prospects
add {error, time_overflow} value and document overflow-related behaviour in tempo.erl
fix tests with respect to overflow issues
Adds to "becoming geek."

Fleshes out the post.
fix sently callback when authed
add qunit test to sently callback
refactoring, the injector works with bindings
resolved time_out issue and added levels
Assets @2x for Music
Expand dependencies and license
鄒青月v2 瞇瞇眼
test commit
deleted test commit
Created an example folder and moved the test files there
Removed the scripts folder from the start and stop functions
Merge branch 'master' into vincent

* master:
  Removed the scripts folder from the start and stop functions
  deleted test commit
  test commit
Added a warning to auralize_ir if the impulse response has more than two channels
Merge branch 'master' into vincent

* master:
  Added a warning to auralize_ir if the impulse response has more than two channels
Added a example for the calculation of a frequency response
Added octave-core files to .gitignore
Merge branch 'master' into vincent

* master:
  Added octave-core files to .gitignore
Fixing if/else branch
DeliveryのSELECT FOR UPDATE文からサブクエリを除外
started make system for multiple platforms
compiles against arduino libs
added build system for arduino libraries into magic
file is unneeded now
compiles and uploads to the uc
arduino libraries working now
cleanup
got serial ports working
build system
added the first testcase for sipo register
added pinout of busmaster port
fixed a bug: shift enable must be defaulted to low
fixed the edge connector: switched sides of the pins
swapped sides of the pcb
few improvements
Merge branch 'bugfix/issue26_friendshipConnectorOnTheWrongSideForBreakout'
Layed out the basic grid system for display purposes
Merge branch 'master' of github.com:shamoons/ghost
Fixed preprocessor state machine bug
Reintroduced debug flags
FIX: Temp file creation.

Corrected bug created by dividing BAT files.
player: chaining
about: code tag for deiban instructions
introduce and respect heading
use rotation
Altered the test for not inserting text into the html if no directive attribute is found on the input or global scope. Removed uneccessary comments.
Resolved merge conflicts after fetch from marcus/master.
Adding new files from repo.
updated the repo from Marcus.
Removed diff header
Merge branch 'hotfix'
Merge pull request #15 from ndhoule/master

Removed diff header
Merge branch 'master' of github.com:marcusphillips/boundjs
Merge branch 'development' of github.com:marcusphillips/boundjs into development
completed test
New tests for directive classes partially done.
Merge pull request #16 from psb/development

Development
added test for bound-classes
better test
removing sanity checks, seem unnecessary now
Proxy test improvements and added some proxy functions.
Merge branch 'development' of https://github.com/marcusphillips/boundjs
Cleaned up more of my comments.
Description clean ups
lazy loading for thumbs
log better
no fade, for speed
Merge branch 'master' of github.com:shish/shimmie2
コメント追加
タスクedit修正
Replaced Bounds with Envelope, and it now implements IGeometry
use yaml-mode
more customizations
some more senders to completely ignore
actually apply dired tweaks
introduce ulteo style
don't use ipython
update some packages
use a clearer name for the gpg signature attachment
become tramp-friendly
----
Adds field class helper.
tri strups with vertex sharing seem to be under control now...
Use browser timezone as base
Finding the app install id
don't group movies into sets in files view
FIX: No update path for pre-frodo scrapped thumb url without "aspect" attribute
library: use userdata/library/ instead of userdata/Database/ for custom video library nodes
Merge pull request #1774 from koying/fixthumburlnoaspect

FIX: No update path for pre-frodo scrapped thumb url without "aspect" attribute
Merge pull request #1777 from Montellese/dont_group_in_files_view

don't group movies into sets in files view
[osx] fixed build
make sure we setup the visualisation preset list prior to init'ing the window. part of #13556
make sure we setup the picture info dialog prior to init'ing the window. part of #13556
make sure we setup the peripheral manager dialog prior to init'ing the window. part of #13556
Merge pull request #1785 from Montellese/custom_nodes_location

custom library node cleanup
logind power management support
logind power management support
Crash fixed
Fixed DBus boolean arg type
Merge branch 'master' of https://github.com/singular0/xbmc
Added opacity to the carusell plugin.

Added opacity to the carusell plugin. Needs some adjustments for IE. CSS3 animations do not work together with opacity!

Signed-off-by: Steve Sinnwell <s@hopeglory.com>
Merge branch 'master' of https://github.com/sinnwell/DUPLO
DistanceEst: Print warnings with verbose option

* DistanceEst/DistanceEst.cpp (estimateDistance): Only print warning
message when -v specified.
(main): Ditto.
DistanceEst: Make thread safe again

* DistanceEst (estimateDistance): Make writing to cerr and modifying
g_recMA critical sections.
abyss-fac: Handle compressed files

* DataLayer/fac.cc: Include Uncompress.h.
Added recursiveDraw methods.
1) Framework in folders layout
Nedgradert fra .net 4.5 til 4
updated googly analytics goodies.
fix compile errors from last commit
add missing xml value files
Updated configs and added tmux
+ Better delta histograms (vertical lines, color, etc).
+ Proper printing of params.
+ Allowed values for const params.
+ Ranking params by fpr and tpr deltas >= 0.
General fixery

Speed up for uploads slightly by moving req.on("data", cb) into a switch.
Fixed uploads that only increased in size and threw off calcs.

Signed-off-by: snoj <josh@snoj.us>
Minor modifications to send any OSGI errors to the console (to avoid the hard to find timestamped error logs) and also some modifications to reduce the number of OSGI errors/complaints in general.

git-svn-id: https://simjr.googlecode.com/svn/trunk@200 56382930-1720-11df-aca2-1133b060dc17
Updated docking frames from 1.1.1p3 to 1.1.1 stable.

git-svn-id: https://simjr.googlecode.com/svn/trunk@201 56382930-1720-11df-aca2-1133b060dc17
Allow properties to be loaded from URLs.

git-svn-id: https://simjr.googlecode.com/svn/trunk@202 56382930-1720-11df-aca2-1133b060dc17
Added some jsoar related launch properties.

git-svn-id: https://simjr.googlecode.com/svn/trunk@203 56382930-1720-11df-aca2-1133b060dc17
removing non-bootstrap themes
added python code for tree and taxonomy representation
Set apache HC logging level back to ERROR

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Make a proper ArtifactMaven IT

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Gem updates for heroku.
precompile assets.
Prep for heroku deployment.
Initial work on adding a scraper service for snipurl
services.Snipurl: Throw CodeBlockedException on links that require a private key
services.Snipurl: ~ is valid character
services.Tinyurl: Try to get original URL from affiliate URL
services.Snipurl: Use default rate limit

Since Snipurl uses some kind of rate limiting, but we are not sure what the
limits are, use the default rate limit of 2 requests per second for now.
Merge branch 'add-snipurl-service'
Bump version to 2.3
Reversed scroll wheel direction.
Changed prefs branch interface per validation results.
Update tf-idf.py
optionally specify and environment file in jetpack.yml that the init script will source
Changes to hg, git and zsh config files
DS-87: let backend set the weight of the lines in relport through RELWEIGHT property
remove pyflakes
remove vim-flake8
Change icons for followers
Updated translation files
Generate feeds for filtered requests
Replace HttpResponseRedirect with redirect shortcut
Test signups with same name, increase coverage
setup user auth flow
fix for video playback
MDL-32709 book: Fix logs handling
MDL-32709 book: now standard module + new strings added

Note the lang file is completely disordered yet
channel logging is done by logger plugin; minor changes
Don't mix with log-plugin-test
change project descriptions
Fix a bug on 'star' and auto-add the star count after successfully staring a tweet
logo is now code font
lpar: Also store info from git-for-each-ref

2c0cf4c4-da05-11e1-b543-00c0a8deee11
国际化和部分页面的汉化
Cleaned Docstrings

PostProcess.py is not working as intended.
Add Segment and Track
Add GpxReader
Add pugixml v1.2
changes to login register and its widget
level by level II
Fix returns incorrect kill/death double value
Tim poisons the cat.
fix files git
help me

Summary: Summar:przesylam plik

Reviewers: astachecki, MrStefan

Maniphest Tasks: T30

Differential Revision: http://egazeciarz.pl:8080/D5
Merge branch 'master' of github.com:t3d/kalibrator
spidersweb.pl

Reviewers: astachecki, MrStefan

Reviewed By: astachecki

Maniphest Tasks: T30

Differential Revision: http://egazeciarz.pl:8080/D5
Merge branch 'master' of github.com:t3d/kalibrator
Added cake session handling again. Added PHP 5.2. Removed 5.3 and 5.4
Control line additions
yasnippet を github から取得するように変更
Melhorias na explicacao, contracao de pronomes obliquos qdo possivel,
ajustes na escolha do artigo ou determinante para evitar usar nc soh
qdo o objeto estiver sendo mencionado em conjunto com outros
Turning back the branch override