labofsahil/github-event-dataset-2012 huggingface dataset:
Added lead content to tag pages
Updated to latest version of frontend common
Merge branch 'master' into views

Conflicts:
	app/controllers/TagController.scala
	app/views/fragments/formatTrail.scala.html
	conf/routes
	project/FrontendTag.scala
Criação das classes ListaDeUsuario e ListaDeCaronas
* add comp_lint_commands setting stub
* don't scroll the output view by default
* add new helper
* allow specifying the commands to run for comp-lint
* add default setting for comp_lint_commands
announce
* fix: not setting GOROOT (on windows go env output a batch script)
* use abssolute paths for mg and gocode
add alias for stage server
extract SeriesUpdate from InstanceStore
fix arquillian tests
fix pyflakes depend
Added support for Windows using the Dokan library.
完善图片上传，上传商品图片(products)的同时生成首页缩略图(thumbs)，目前每上传一张商品图就会同时上传一张首页缩略图。
Intermediate commit of prior pending pull request; generally superceded now by the next one.
Final commits for the research grant task set.
article thoughts and search term index
add script to install vundle for vim
Removed problems folder
Added 2048 megs for vm
added 6/15/2012
starting point
Merge branch 'master' of github.com:hayaku-fr/hayaku-test

Conflicts:
	.gitignore
	index.html
gf
Support for Linux, Windows and Partial mac os x
support for MacOSX, Linux and Windows/Cygwin
Added example_instructor_project
adding search things
Restructured, added a top-level manifest and pulled in extra files that were missed for latest update
Bumped version
reFUCKtoring
fix error password
Very minor change

All I did was take out a blank line.
Fix wrong PC pushed to stack on subroutine call.
Fix xor draw.
Force collision to be int
Force screen coordinates to be inside the screen's area.
Use bytearray for registers and keyboard, instead of list.
Extract magic byte coercion to a helper function.
Pygame wrapper hack.
Ignore .noseids
Add redness to the requirements
Add game ROMS.
delete gcal event
No projects and login UIs done
Merge branch 'master' of github.com:heynemann/skink.vnext

Conflicts:
	.gitignore
EAGLE version 6.3.0
parse with SAX
Entity enum added
Двухнедельный update, добавлена проверка ipmask + рефакторинг
Don't limit max length of password.
Merge branch 'master' of github.com:horejsek/python-check
Fixed builds unpacking twice for linux64.
Speed-up and improved formatting

I only generate a citation once, and store it in item[:cit], reused a number of times.
Also only list publications which have notes or clippings on main bibliography - all are still listed on author/kw etc.
Names of publications/authors/keywords are no longer printed, but individual and total times are.
Changed bibliography to use Dokuwiki tables instead of HTML (makes links work better local and remote).
Some reformatting for legibility.
admin users should use their correct tenant id as well
Merge pull request #177 from pdmars/admin_user_tenantid_fix

admin users should use their correct tenant id as well
major refactor
useless file removed
Skills added to backbone
created lab 3 folder

populated lab 3 with

-- main html
-- css
-- image
Added hidden to hide header h1.
Fixed spacing.
Fixed data theme to show wrong design implementation.
rename menu item to test corps
allow issue_controller#all without login
show issue tags, refactor tag cloud code
workaround for escaping in emails, https://github.com/rails/rails/pull/7976
indicated form fields with errors
add nice name of email sender
fix i18n for email unsubscribe
update unsubscribe footer message
make user role inaccessible
fix deletion of themes
add link to all issues in sidebar
fix titles of issues when to theme
rename menu items
user jan join/leave testcorps
test corps improvements
ibikecph style illustration
official ibikecph colors
help on route page
update join/leave corps, allow corps/ witout login
avoid autoload of issue object
RESOLVED: http://developer.raikes-ds.com/jira/browse/PRTLP-29
Merge branch 'hotfix/0.20121014' into develop
mkirby: Began creation of CyEdge translator and CyTable translator.
use defaults for tmux status bar
mouse mode interferes w/ X middle-click paste, etc
Add .gitconfig
Progress towards Request/Response handling
add accelerometer
Merge remote-tracking branch 'origin/master'
fix #5 and update some other gems while im at it.
Bugfix: variable name clash in sealdeal.js
Fix bug with no layout pages
Updating CMakeScript

MPIFacedetector as library and beter FindArtoolkiPlus
Merge pull request #51 from openenergymonitor/dev

Dev
Reintroduced the raw graph power statistics
Merge remote-tracking branch 'upstream/master'
Transfer struct range to wget.h. Make metalink code optional.
mainwindow: add e-mail address
dfbinputre: split DFbInputPacket defintion into a separate header file
Name of Labelhelper to fix case problem in class name
Search with new Indexes.
Lazy List added
made version configurable
netroute: add preliminary linux support
Merge pull request #1 from bnoordhuis/linux-support

netroute: add preliminary linux support
Caps in header
Merge remote-tracking branch 'thomas/master'

Conflicts:
	app/views/pages/get_started.html.erb
added drag and drop menu
added drag and drop menu
Merge remote-tracking branch 'pandi/master'
Merge branch 'hotfix/natepanic'
more README tweaks
alternate reality for README
Merge branch 'feature/conflict' into develop

Conflicts:
	README
Merge branch 'release/0.1'
change check for features to test for length
Merge branch 'hotfix/emptyfeatures' into develop
Fixed bug in framedetailview making the image panning impossible when the window is scrolled down
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop
Fixed calculation on css fixed top position
Merge branch 'develop' of github.com:ingenuitas/SimpleSeer into develop
Fixes #167: Make sure we call end_request when we're done with the pymongo connection

Signed-off-by: Rick Copeland <rick@arborian.com>
Merge pull request #168 from rick446/rc/167

Fixes #167: Make sure we call end_request when we're done with the pymon...
Initialize Project

Signed-off-by: Cyanogenmod <ingressinvitation.rc@gmail.com>
FIX: test-lib: Print differences when test_expect_output fails.

When the command-under-test fails with a non-zero exit code, neither the different exit code nor any output differences are printed. Also, there's a lot of duplication between test_expect_output and test_expect_code_and_output. So, let's fix both by delegating the first to the latter.
Merge branch 'testlib-parse-enh'
Set the home for the zope user.
App Layouts
Add content type in HTTP responses
add files to gitignore
del readme.md~
KOKU-1302 KOKULT-151 Refactor code
Merge branch 'develop' of github.com:ixonos/koku-processes into develop

Conflicts:
	kv/KOKU-MultipleTextMessage/.settings/associatedBuiltResources.properties
	kv/KOKU-MultipleTextMessage/.settings/dataobjects.importers.properties
	kv/KOKU-MultipleTextMessage/build/Forms/Kayttajaviestinta_init_Form.gi/components/appCanvas.xml
	kv/KOKU-MultipleTextMessage/build/Forms/Kayttajaviestinta_reply_Form.gi/components/appCanvas.xml
	kv/KOKU-MultipleTextMessage/build/Forms/Kayttajaviestinta_reply_Form.gi/js/logic.js
	kv/KOKU-MultipleTextMessage/build/KOKU-MultipleTextMessage-tempo.zip
	kv/KOKU-MultipleTextMessage/build/Processes/Kayttajaviestinta-Prosessi.bpel
	kv/KOKU-MultipleTextMessage/build/Processes/Kayttajaviestinta-Prosessi.pipa
	kv/KOKU-MultipleTextMessage/build/Processes/Kayttajaviestinta.svg
	kv/KOKU-MultipleTextMessage/build/Processes/KayttajaviestintaReply-Prosessi.bpel
	kv/KOKU-MultipleTextMessage/build/Processes/KayttajaviestintaReply-Prosessi.pipa
	kv/KOKU-MultipleTextMessage/build/Processes/KayttajaviestintaReply.svg
	kv/KOKU-MultipleTextMessage/build/Services/KokuMessageProcessingServiceImpl.wsdl
KOKULT-634: Intalio: update of Consent creation form

Added several schema changes, fields and dropboxes for KKS -values and functions
to use and get prefill values for them. Mapped them to schema and partially to
webservice -calls (organizations).
Merge branch 'develop' of github.com:ixonos/koku-processes into develop
move splash screen
deleted:    TimeConvert/.DS_Store
fix Issue 1772 - regexp.split behavior with captures needs to be documented

A documentation clarification, the report itself is largely outdated.
Supplemental change required by 6681

A unittest in std.format has been relying on a CTFE bug.
Setting one field of a union, and then reading from another, is not
currently supported in CTFE.
Change toUTF16z to use toUTFz.
Changed toUTFz to use an outer template.

It's easier to define aliases this way. I created two templates though
so that you can still pass both template arguments if you want to, and
it'll avoid breaking any code.
Merge pull request #491 from blackwhale/issue-1772

fix Issue 1772 - regexp.split behavior with captures needs to be documen...
Merge pull request #494 from jmdavis/toUTFz

Changed toUTF16z to use toUTFz
Merge pull request #493 from donc/bug6681

Supplemental change required by regression bug 6681
fix Issue 7679 - std.regex.split and splitter don't work w/ ctRegex
fix Issue 7138 - Can't call array() on dirEntries

Alias this now appears to work properly, hence all tricks & problems
 with dual opDispatch are removed.
Also fixes:
Issue 7264 - Can't iterate result from 4-arg dirEntries as string
revert changes to deprecated stuff
Merge pull request #490 from blackwhale/regex-splitter

fix Issue 7679 - std.regex.split and splitter don't work w/ ctRegex
Merge pull request #481 from blackwhale/regex-fix-parser

fix unreported bug in std.regex parser
coerce string to other types workaround
Merge pull request #495 from blackwhale/issue-7138

dirEntries issues 7264 & 7138
string to int coerce unittest
fix Issue 7674 - regex replace requires escaped format

Kill unnecessary escaping in replace format string.
changelog entry for issue 7674
Merge pull request #492 from blackwhale/issue-7674

Issue 7674 - regex replace requires escaped format
Merge pull request #496 from adamdruppe/variant-fix

coerce string to other types workaround
changelog for pull 495
Initial Stations file added (originial values)
BuilderTool: Vertices marked
BuilderTool: Taxi Connections marked
BuilderTool: Bus Connections marked
BuilderTool: Ferry Connections marked
BuilderTool: Underground Connections marked
Moved original graph description and board image to Board
Merge branch 'theboard' into develop
added "where to go from here?" slide
First commit
Merge branch 'master' of github.com:jamesrampton/dotfiles
video now on cname
Add agent to world before checking where to place him.

If the agent isn't add to the world, its collision box will have nothing
to collide with so Agent:can_be_placed_at () will always return true.
Fix attempt to iterate table without pairs ()
added do not use statement.
formatting and pricelist work
Add initial test frame testing stuff.
Added CONFIG global to store super secret information.
Publicació de les noves versiosn de ADUCON i AISAIS
Afegits els links simbòlics de CRIPTOLIB
Getting info of layout
Added methods for operating server (start, debug, etc.)
Review permissions and figure manipulation (see #8815)

Add method canAnnotate, canDelete etc
so that group owner and admin can manipulate roi.
Database creation changes

went ahead and commented out line since databse ideas were postponed.
réécriture de la section sur l'utilisation des classes
try to fix github upload
added account(not working), static view for info. Restore header and footer div
Merge branch 'master' of git@github.com:jensongithub/projectA.git
Updating to allow Ruby 1.8.7 syntax
Bug fixed on the server app.js
fixed 2 inconsistency bugs
use thin
dropdown coffeescript
use thin locally
Added environment for simulation.
Altered token_identifier saving
Identifier problem
input text, id
nested launches working
a ver ahora???
de todo un poco
Show total time of results for runner.
VGA example working with the Altera DE2

The solid color VGA example works with the
Altera DE2 board.  The screen is displayed
as one solid color and three input switches
allow the color to be changed.
Update src/cli/new.coffee
Merge pull request #12 from iammerrick/master

Fixed spelling error
bugfixing
Merge pull request #16 from riddlore/master

bugfixing
free from rails 3.0
Documentation fix (wrong IDs)
Merge pull request #1 from samastur/master

Wrong ID values in documentation
Moved around some logix
hide connect button after press
Took out unnessessary styles
NXT says hi.
Activity add not solved yet

Signed-off-by: Joonas Jauhiainen <joonas.jauhiainen@metropolia.fi>
- bump adressable version
change on index.jsp:
style tag before script tag
Merge pull request #1 from jos3osuna/jos3_20120904

change on index.jsp:
Modified Access Denied Page
Deleted accessDenied HTML version
Changed accessDenied page from HTML to JSP
Added ability to remoe clones
Initial search tweets
viewport adjust for mobile
better handling of value from array when cleaning thread locals
Upgrade to guava 12.0, closes #1920.
Binary field is stored by default, allow to disable it, closes #1919.
better logging when warming up
org.elasticsearch.common.collect.Tuple have 2 identical methods, closes #1922.
Percolator: Filtering percolators based on a query can cause wrong matches to be returned, closes #1925.
GET document response returns exists field twice, closes #1926.
Get API: When _source is disabled, the source is still used if fetched from the transaction log, closes #1927.
Debian: Update deps to be on openjdk-7-jre-headless first, then 6, closes #1929.
Added JAVA_HOME paths (6 and 7) for Ubuntu 12.04 x86_64
better listing of jdks to try
Allow to customize quote analyzer to be used when quoting text in a query_string, closes #1931.
Query String: Add `lenient` flag to support *value* parse failures, closes #1932.
Query DSL: query_string syntax to support wildcard fieldnames in the query text, closes #1936.
Query String URI: Add `lenient` to the URI `q` parameters, closes #1937.
Shutdown API: When sending an "all" shutdown, it also shutsdown node clients, closes #1939.
deb: ES_HEAP_SIZE not exported, closes #1947.
Percolator: Wrongly using analyzer configured for the actual index on percolator filtering, closes #1948.
Percolator Index: Don't index the `query` element in a percolated query, closes #1949.
Added short description to execute() method of new features
Fixed weird problem where Transformed::Transformed sometimes doesn't set updateUIinProgress to false
Optimalized checkbox filtering
Modified xml, added checks and build snumber overflow.
Implemented Groovy help.
check for wrong format
write new adjfile if not present
tweak and fix
Pruebas

algunas pruebas
Fix insert and show values button
Hide registration link
Add scaffolded survey_value_set model
Pretty up, wire up and translate survey_value_set views
Add helper text in survey_value_sets form
Hide empty fields in views
Add authorization for survey_data_set and survey_value_set
Add doc raptor
Expand region package.
Formatting.
chocolate-rain-theme.el
Add chroma aberration controls that we will finish later
Add a todo, and we are done for now
Fixed Google Map API edit, new, controller issue on locations.
Merge branch 'master' of https://github.com/jusroberts-cb/job_map
merging again
adding again
Remove unused option from CLI
Oops. Add back read command
added meme: eye contact
.osx: Remove the auto-hiding Dock delay
.osx: Enable the debug menu in iCal and Address Book

Thanks to @3vincent. See issue #5: https://github.com/mathiasbynens/dotfiles/issues/5#issuecomment-4896967
.exports: Highlight (color-code) section titles in manual pages
Added default to add a spacer to the dock.
Merge pull request #47 from KeyboardCowboy5/patch-1

.osx: Add a spacer to the Dock
.osx: Disable the “add spacer to Dock” commands by default
Added line to add text selection to QuickLook

Created another entry for the ability to select text when viewing a
document in QuickLook
Merge pull request #49 from SomeWhores/master

.osx: Allow selecting text in QuickLook
.osx: Minor tweaks
.osx: Group commands by type
.bash_profile: Add tab completion for `killall SystemUIServer`
.osx: Make Trackpad settings more robust

Fixes #48.
.osx: Add hot corners
# Shorten Dock show animation speed
# Completely kill hide/show animation:
Merge pull request #50 from fruityth1ng/patch-1

.osx: Tweak Dock hide/show animation speed
.osx: Cleanup
.osx: Add “focus follows mouse” commands for Terminal.app and X11 apps

I disabled (commented) these settings by default as I think it’s confusing that “focus follows mouse” works only for some apps. I’d rather have consistent, less confusing behavior across all apps, even if it’s not as useful.
.osx: Prevent Time Machine from prompting to use new hard drives as backup volume
.aliases: More generally useful shortcuts
Merge pull request #52 from wimleers/master

.aliases: Add `o`, `oo` and `l`
Added a hall of fame section
Merge branch 'master' of github.com:jvelo/Project_Abitbol
Moved the vapor directory from ./spherical/vapor to ./vapor.
mod: README.txt
mod: README.txt
Update to use the latest utilities package.
Merge branch 'master' of github.com:kalekundert/TestSuite

Conflicts:
	testing.py
Gleefully rip out all the remaining UI code that we don't care about.
Grr, I stupidly left an unwanted return statement in somehow.
Merge branch 'develop' into file-uploader
Table cell renderers will now render and image in the cell when a label provider supplies one.
introduced complete flags to save speed; fixed bugs in bidijstra; fixed bug in oneway parsing; fixed minor bug in MemoryGraphSafe
minor change to readme
Delete Collector class
AnnotationParser class
css form element error support
Added example.
Merge branch 'master' of github.com:kaspernj/knjappserver
Fixed schemas for plugin.
Split the Bowerbird CSS into a separate file.
Merge branch 'release/0.1.1'
Bumped the version.
Refactor in memory allocation.
Add Standard ML version of Ex1.4
Use let in ex1_04.sml
Pull logic into hidden get_op function in ex1_04.sml
Merge branch 'release/0.2.0' into develop
removed datepicker loads, expiring headers and using memcache for caching
new gemfile
bump da version
Merge branch 'release/0.2.1'
removed redundant `synchronized` designation for `getDatabases()`
Creating team view and listing teams depending on roles
changed length of index page
ACCUMULO-450 added timestamp to key hash code

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1334204 13f79535-47bb-0310-9956-ffa450edef68
add section 2.6 which shows a special label depending on the number of guests a participant has
Merge branch 'master' of github.com:kellywu/railsgirlschi
fresh cache module
default SimpleCache
docstring
Make account show page prettier
for now only project set up - code to come soon with our loxone installation
u will run heroku
fixed test/cursor.js test case.
squash! Fixed Bugs: /hg quit Block Place/Break issues
Added product ideas
Password maybe?
shuffle in-place
Update disastrous/src/co/cc/totalknavery/disastrous/ClassicGameplayState.java
Finishing SVN -> GIT conversion (.gitignore)
Updated changes file including new version
libv4l2rds: fixing small bug introduced by removing version field
Ported to Windows
Added comments
1 byte s/r interrupt transfer works
Ability to play/pause/stop/prev/next XMMS2 bound to portgroup

passthru of these playback commands
ktv settings
make the build comptible with gradle 1.0
refactor cell processor interface
Added snapshot repository for deployment.
Fixing disappearing titles
Clarified the comment for the Fixture-Body HashMap in fizzy.World
add integration tests for bills. fix failing controller tests. add error reporting to bills/new.
clean up bootstrap_and_overrides.css.less and add custom glow around input fields
add item model
add tests and validations for item model
Initial ArchSensor commit
sync back with local to make different main versions
deleting sublime workspace
more
Added multi-arch binary for OSX 32 and 64bit
Update GrowCut-gui/main.cpp

main.cppの更新をしない旨をコメント
Adding mode to deploy.rb in resources
to add intent op
Added ForkMe banner
[ikc] one new product
added task_groups_controller and specs
Changed syntax of .getVar('prototype') to .vars.prototype as suggested by @stof in PR #1484
test codes in dscript.subproc
add tests in subproc
Added paperclip and aws-s3 gems
Update README.md
Merge pull request #1 from JohnMuller/patch-1

Update README.md
appliance: Update comment to note that systemd package now contains udevd.
appliance: Update paths to udevd.

systemd is playing a WTF game with udevd, moving it around and
renaming it unnecessarily in each release.  Chase all known locations.
Update Rails version, fixes #13.
Mysql2 should be MysQL for rails 2.3.x versions. Issue #12
Pin Comma to 0.5.2, fixes issue #10

Latest comma incompatible with Rails 2 versions.
Bundle install locally, without test.
Merge branch 'feature/init' into develop

* feature/init:
  Bundle install locally, without test.
  Pin Comma to 0.5.2, fixes issue #10
  Mysql2 should be MysQL for rails 2.3.x versions. Issue #12
  Update Rails version, fixes #13.
Database tables lowercase. Fixes issue #14.
Merge remote-tracking branch 'piratenpartij/develop'

Conflicts:
	Gemfile
	Gemfile.lock
(Xbox1 v0.2.97.27) - work on Xbox 1 port
removing ugly truncator code
FACES-1377
Develop new liferay-faces-bridge-ice.jar dependency
Fixed logger FQCN
FACES-1358
Develop JSF1 <-> JSF2 compatibility layer
(EL expressions not getting evaluated on Mojarra 1.x)
FACES-1258
icefaces3-crud-portlet is not instanceable
Fix issue #122.
Support boost-filesystem v3
Fix build

Sorry
Awards should go to user WITHOUT oprah.exempt perm
a little more cleanup of old digital loader code.
works with productswithimages.csv
Added CSS demos.
mk_hwpack: use .tar.xz instead of 7z
Update regular expression to match more general chain syntax. However, static methods and dynamic invocations are not replaced
Ensure article summary runs thru all template handlers
tried a few changes
add the nginx_alarm count
fix бага ajax обработки форм
fix evaluation order, per spec (a then b)
hex output
Prueba 1-I,2-II
Fixed CSS Grouped Selectors having an incorrect specificity, preventing proper override behavior.
finished and renamed
finished and renamed and actually added
Wrote readme
added submission
Added Sprockets and updated app structure to fit asset-pipeline structure
Remove and ignore pyc files.
Bubble up connection errors
travis: maybe I don't need to update autoconf at all
server start/stop working
regularized argument list management in server provisioning
integrated Mike's code
error handling in prov-n
Add option to auto login after activation
Revert "Merging in Pages"

This reverts commit a3c47fb2de12e8efeaa7d1615f44219085760465, reversing
changes made to 73b3ea97893bcc63a392094e46786c43b8c95156.
Revert "Revert "Merging in Pages""

This reverts commit c0849b9ee1909d5513e8b9d9e6a09f9601025a7c.
Revert "Revert "Revert "Merging in Pages"""

This reverts commit fcc19b3e3e610ab99209448de19a6ff89ee8b6f7.
Added FENNEC_15_0_1_RELEASE FENNEC_15_0_1_BUILD1 tag(s) for changeset default. DONTBUILD CLOSED TREE a=release
Added FIREFOX_15_0_1_RELEASE FIREFOX_15_0_1_BUILD1 tag(s) for changeset default. DONTBUILD CLOSED TREE a=release
Added THUNDERBIRD_16_0b2_RELEASE THUNDERBIRD_16_0b2_BUILD1 tag(s) for changeset default. DONTBUILD CLOSED TREE a=release
Merge remote-tracking branch 'mozilla/master'
Merge branch 'master' into linux64-unittesting
fix route name in docbloc
fix locale switcher
Merge pull request #29 from lunetics/fix_switcher

fix locale switcher
Copied example code from obsolete ML-Lex manual.
Converted call to function 'input' to ML97 function 'TextIO.inputN'.
Changed code to use foldl and op^ instead of String.implode, to
convert a string list to a string. Also foldl reverses the list,
instead of needing to call the reverse function separate.
Added comment indicating purpose of this code block.
Renamed interactive file, moving it to sample-lexer directory.
Changed structure of makeLexer function call to CalcLexer.
Fixed other use of std_in, changing to stdIn for ML97.
Fixed reference to stdIn. Must prefix it with its Structure name.
Replaced right quotation marks with apostrophes.
[games-board/pysolfc] fork the build to set python-tk dep., bug 2589
[games-board/pysolfc] Manifest
bug fix
bug fix
bug fix2
add logger
move Files.
First cut at ImmediatePlayersList
fixed duplicates in links controller
ignore pids for the dev server
fix date for autobot image
sort-stability article
tech interview
fixed grammer error
added lanette post
add shmuel talk
added Input post
scrubbed the final articles - I think that is all
mono update: Ignore threads created before initialization on Windows.

See winehq bug 30947.
init
Merge branch 'master' of github.com:madhavsuresh/gradapps
Fixes linkable essence text button styles.
Better contents_helper specs
Deprecating render_essence_editor_by_position and render_essence_view_by_position helpers.
Setting up for inclusion in super-project
update to super project
Merge branch 'david' into super

Conflicts:
	CMakeLists.txt
	src/maidsafe/dht/version.h
Work on super-project.
Changes to CMakeLists.txt for super-project.
Update.
Further super-project work.
working version in super
update to super- testsed ok in clang / gcc4.7 linux
Fixes for Clang on OSX.
Updated IDE folder structure for super-project.
Merge remote-tracking branch 'origin/next' into super

Conflicts:
	CMakeLists.txt
	src/maidsafe/dht/node_impl.cc
	src/maidsafe/dht/tests/mock_node_impl_test.cc
	src/maidsafe/dht/tests/rpcs_test.cc
	src/maidsafe/dht/tests/services_test.cc
Merge remote-tracking branch 'origin/rudp' into super

Conflicts:
	src/maidsafe/dht/tests/mock_node_impl_test.cc
	src/maidsafe/dht/tests/mock_rpcs_test.cc
Fixes for compiling on OSX
Updated for super project using MSVC11.
Added API headers to target.
Added custom experimental target for use in super project.
Minor change to CMakeLists.txt
Merge remote-tracking branch 'origin/next' into rudp

Conflicts:
	src/maidsafe/dht/tests/mock_node_impl_test.cc
Fixed MockRpcsTest.
Unit tests compile
Add missing distro package
- better log messages
Removed unused variable in fasta-stats
tcmalloc: first impl
base: ease import of hepwaf tools by adding _heptooldir to sys.path
Ajuste Observaciones,Configuracion Prueba Entrega
Revert "Ajuste Observaciones,Configuracion Prueba Entrega"

This reverts commit 3cceaf890f7befee687a438829f6c7c75a37470a.
Fix Models for mvp
ajax loader , javascript refactor start
module additons
make file with clean in it
Retirei includes redundantes
fixing empty timestamps now really being empty and not 1.1.1970
clearing users cache on verification and registration, since overview is cached
fixing users:registration test
solved - prefix outgoing issue
solved - multinumbers cli issue
Compress scripts/styles: 3.5-alpha-21400.

git-svn-id: http://core.svn.wordpress.org/trunk@21400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Update comment to reference current option name.
solucionada edicion de compra
divertctrl/configure.ac: updated from configure.in

* rename configure.in to configure.ac for recent autotools
* require autoconf 2.68
* update/remove obsolete macros
* quote arguments to AC_../AM_.. macros
* add missing macros CONFIG_{SBIN,MAN}DIR
divertctrl/Makefile.in: adapt to configure.ac changes

With CONFIG_{SBIN,MAN}DIR variables set in configure.ac,
there is no need to load the global Makefile-snippet autoconf.mk.
divertctrl: autoreconf

Update all files generated by autotools via a call to 'autoreconf -if'.
eicon/configure.ac: fix typo & autoreconf

CONFIG_MANDIR erroneously evaluated $sbindir instead of $mandir.
Makefile: adapt to recent changes for eicon/

eicon/configure uses --sbindir & --mandir - no need for special-casing
Makefile: make options for configure more readable
Makefile: less special-casing for eicon/

Instead of special casing the complete call to configure for eicon,
it is sufficient to only declare an addition configure option in
this case. This makes the stuff much more homogenous.
Makefile: convert .config -> scripts/autoconf.mk

Convert the global Makefile to use the generated Makefile-snippet
scripts/autoconf.mk instead of the shell-script snippet .config.
capiinfo/configure.ac: fix double-evaluation & autoreconf

No need to double-evaluate CONFIG_I4LCONFDIR.
vbox/configure.ac: revert wrong-optimization & autoreconf

Keep definition of VERDATE as it was in configure.in
cappinfo/configure.ac: simplify & autoreconf

* remove unnecessary macros & symbols
* config.h is used nowhere: get rid of it's template config.h.in
Makefile: pass I4LCONFDIR as --sysconfdir to configure
capiinit/configure.ac: update & autoreconf

* remove unnecessary macros & symbols
* add evaluation for I4LCONFDIR
capiinit/capiinit.c: use 'configure'd path for capi.conf

Look for capi.conf in the path determined by configure at compile time
instead of the hard-coded /etc/capi.conf.

Beautification: replace 0 -> NULL in firmwarepath[] definition.
capiinit/Makefile.am: install capi.conf & autoreconf

Install capi.conf in the path determined by 'configure' at compile time.
capiinit/capiinfo.8: use configured path for capi.conf

Generate capiinit.8 at compile time from capiinit.8.in using 'configure'
to use the configured path for capi.conf instead of the hard-coded
/etc/capi.conf.

The necessary changes took place in configure.ac & autoreconf
fixing final changes
Bundler doesn't seem to like non-ASCII characters

Somehow, bundler (in this particular environment) insists
on readings gemspecs as US-ASCII.
Add rcfile (loads parameters from a file).
Add rc_context and rename rcfile to rc_file.

rc_context is a context manager that optionally accepts a file name:

with mpl.rc_context():
    mpl.rc('lines', linewidth=22)
    ...

or

with mpl.rc_context(fname):
    ...
Add docstring to rc_context and accept a dictionary too.
Add test_rcparams.py to test rc_file and rc_context.
Update/tidy test_rcparams.py and move mpl.rc to test_rcparams.rc.
Add rcfile (loads parameters from a file).
Add rc_context and rename rcfile to rc_file.

rc_context is a context manager that optionally accepts a file name:

with mpl.rc_context():
    mpl.rc('lines', linewidth=22)
    ...

or

with mpl.rc_context(fname):
    ...
Add docstring to rc_context and accept a dictionary too.
Add test_rcparams.py to test rc_file and rc_context.
Update/tidy test_rcparams.py and move mpl.rc to test_rcparams.rc.
Merge branch 'master' of github.com:memmett/matplotlib

Conflicts:
	lib/matplotlib/__init__.py
Add note about rc params to whats_new.rst.
Merge pull request #861 from memmett/master

Add rcfile function (which loads rc params from a given file) and associated context manager.
Starting to build code
Added First Code
Added Sample Configuration File
Combined list and group search. Sorting.
Created a default editor session and added file output.
yeastmine working
Add statserv/manage/channels allowing you to add/del/list channels thus far. It is important that this is loaded after statserv/bot/main if you want bots.
alterado sample caixa sinco para usar sempre o time()
generalizado o método gerarBoleto()
fix google #1495
19 november
- (3528722) Correct a bug with throughout sequence expressions
support for soft constraint
Merge pull request #38 from apaiva/master

soft constraint support add
Merge remote-tracking branch 'upstream/master'
uvm tests check for non empty index
Merge pull request #40 from mballance-sf/master

Bug fixes -- bind parse, improvements to select prev/next word
simple util to populate file with string
uvm1.0 basic tests revived
uvm-1.1 add
Merge branch 'uvm_basics' into uvm_basics_11
uvm 1.1 tests added
UVM 1.0 tests removed
duplicate uvm-1.1a zip removed
Merge pull request #41 from apaiva/uvm_basics

UVM basics tests revived and UVM 1.1 tests added
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sveditor/plugins/net.sf.sveditor.core.tests/src/net/sf/sveditor/core/tests/index/TestUvmBasics.java
Add files for updated shadow index behavior
Remove UVM directory
More snippet cleanup changes
remove order_option tablename prefix
Use Mono's implementation of System.Xml.Linq for .NET 2
add the tableview
Fehler in yml behoben
Add getFirstFormat method to eContentRecord
Fix subTitle call to be to property rather than method
Fixes for showing OverDrive Holdings in IE 8 and below
Add missing image
Merge branch '2012.16.2' into 2012.17.0
Correct path to bots ini file
Fix renew all messaging
Add documentation for embedding tokens into materials request emails
Create PAckaging App to package files on the ACS server
Clear renew message
removed bin/jobs/hourly.rb
Add UI to select user account and start authentication

Phase 1 of #13. Still need to request auth cookie from Pick The
Winner Google App Engine server.

Signed-off-by: Greg Meiste <greg.meiste@gmail.com>
typo and new date for final release
Remove comment on JSON

JSON do not support comment…
http://stackoverflow.com/q/244777/365479
Add popular events list
Revert "meh"

This reverts commit db85e26d9b85adfb6a7dd2c10689a4cbe7a0210c.
Minor fixings on road to bulk inserts
Update application/config/stylefinder.php
1.4.1
Back to snapshot
updated the sphinx theme
older firefox users why
init; added jquery input placeholder script;
atualização JEC-Projeto - configuracoes inittab
Added GenRow in Handler, still no unit tests...
webfinger: pass "type" attribute in links, as seem to be the way with newer api
setup: added "conf" option to extras
Added thumbnailwidth class to thumbnail img tags to constrain their widths.
Aravind, Ashok | #1774 | Adding required dependency for purging.
Aravind/Imdad | #00 | Returning empty list instead of null.
Aravind | #	2112 | Removed the redundant post.
Vandana, Sharvani | #0000| Updating platform version to the latest.
fix logging and remove some some noise
Starting to address #14; learning coffeescript at the same time...
JSF # 014 # 01 : data-table master-detail selection POST-TERMINAL added more logging and some traces
JSF # 008 # 03 # [SUB-STAGE E] : created simplified, cut-down version of the script for GM
JSF # 014 # 02 : data-table master-detail selection with objects troubleshooting failure to select detail STAGE INITIAL
JSF # 014 # 02 : interestingly, it now breaks and returns null at the master select as well when the toString() methods are overriden
JSF # 014 # 02 : got it to work again in View scope with toString() overriden and semanticUniqueness defined in detail entity
JSF # 014 # 02 : got it to work in View scope with toString() overriden in both master and detail entities and essence function defined
randomplots Makefile enhancements
CJSFv3 Chapt.01 simple example with Ajax instead of new page
CJSFv3 Ch.2 the number quiz
CJSFv3 - the Ch.1 login project without Ajax
extra test for NET35 / multi
Updated Table methods to better support multi-DB

No sense in escaping TableName only for update, "from" isn't universally
optional for deletes, First() should be virtual to allow alternatives to
TOP 1
Support for reserved words as columns

Insert failed when a word such as order was used as a column name.
Added [] around the column name.

Also modified the test for InsertGetUpdate().  The first Get is now a
User instead of IUser.  There is some bug where using the interface
twice first on a null result and then on the real result causes the
reader to not be open when trying to map the type.
Fixed issue DapperTable

This fixes a bug found in CS 51509960 where the following sequence would
result in an InvalidOperationException being thrown due to an attempt to
access a disposed of DataReader:

- Perform a dynamic query that yields no results
- Add data to the source of that query
- Perform a the same query again
Merge pull request #60 from bundy845/master

Allows a class to have a reserved word as a column name.
fix parameter reference in anonymous function
Would occasionally generate exception "Invalid attempt to call MetaData when reader is closed"
Added database schema support to Dapper.Rainbow
Added possibility to add custom type maps - enables serialization of enums to DbType.String instead of DbType.Int32
Merge pull request #62 from paaschpa/master

Bug fix for "Invalid attempt to call MetaData when reader is closed"
Merge pull request #63 from seburgi/master

Added database schema support to Dapper.Rainbow
Merge pull request #61 from TheDavester/master

Fixed DapperTable issue
Removed Id parameter when calling Table.Insert

"Id" is being removed most places in Rainbow, but not on Table.Insert. I
changed this to make it consistent with SqlCompactTable.Insert and
Table.Update.
Merge pull request #68 from tms/rainbow-extensibility

Updated Table methods to better support multi-DB
Merge pull request #66 from rayjezek/master

Rainbow: Ignore Id property when calling Table.Insert 
DapperRow.Count is now O(1), added type-safe reflection, added GetValue
DapperRow.TryGetValue now tests for DBNull and sets the result to null if true
DapperRow dynamic invocation incompatible with Visual basic fix
make fetch_players_by_first_name_as_array case insensitive
return graph instead of function
add isUrl attribute
fix callback
git wants me to commit this
I don't see the point
fix callback
git wants me to commit this too
whitespace? but the lines are the same
allow file drag and drop on playlist
more gitsadness with whitespaces
MO moved to another location
fix loading split images with 'Load all sounds' link
version
build 0.73
fix indentation
make explicit that transaction has to be entered once
mp4ファイル1ヵ月前のものを削除
番組録画予約非同期実行廃止
CSの録画予約廃止
xml file名
xml file名、zenity timeout
Fix rendering of modded items (support Forge ITextureProvider)
fixed php module ini path
submit latest update
Change the category into kind for the category name has alreays existed in the system
forgot to add extra column into schema file
Skip closest tests if no Bing Maps key.
Correct the name of the sysvinit script
Fixed Switch-Case break tags.
Changed Node Array Code.

Now storing using DFS.
Now also not storing pointers in array -> compatible with CUDA
log.php: Don't do anything for now
- security fixes, utf-8 data encoding in ajax calls
Dotcloud uses pgsql
Added a quick header to point to Athletable
Added selectionColor and todayMarkerColor. Fixed header inclusion bug. Added missing init method for the ViewController.
Adding favicon
Removing broken favicon
added templating for crypted rootpw
Changement systeme gestion interface > passage dans les settings (phase 2 : supp. des fichiers lib/)
adding ref for test, again
added labels to SVG of inner brain, plus beginning lines
fixed post / page style issues
- Show simple coordinates (like dayzdb.com) at the player overview
- Added Location mapping to show actual location names
- Show a sniper badge in the player overview if a player has a sniper
updated home page with signin form, working on json import for reading mode
removing discarded files
introduce yaml configuration, implemented with apache commons configuration interfaces
Merge branch 'master' of github.com:nethad/clustermeister
Refactored composite command to allow for hierarchical auto completion on CLI.
JGA-14: prevent 404 errors for rest-service-fe/search-v1/crossRepositoryQuery
Update, add test case.
fix setup.py - push 0.5.1
Updated documentation
Merge github.com:nextgen-astrodata/DAL
Added SVN URL alias
more aliases
python2 env set explicitly in Pharo Launcher
Added git prompt
Added SBT to environment
fixed path of git prompt
update to include nic's servers being moved to this system.
Merge branch 'master' of github.com:nicferrier/secondarys
Updated the code styles for HTML and javascript.
Work in progress on registering virtual profiles from Java (BROKEN)
New Format-Chart.ps1
Add accept header to url connection in load-vocab
moved splitable tests to splitable engine
comments for refund
allow add_alter user to deal with unknown user names
add [show source] links to Sphinx documentation
New BTC Logo
Error in isStraight in Poker.scala
TwimSearch add include_entities parameter
Merge branch 'release/2.0.2'
Adjust power of player ghosts.


Signed-off-by: nppangband <nppangbanddev@verizon.net>
Changing Gemnasium status image on README.
Adding Code Climate link to README file.
update url/fix aur name
gem name fix
Database & table generator fixes
Add MillerRabin.hs from Project Euler code

Also move prime defn into MillerRabin.hs, since it is much faster
added modulus to the col generator
Added dynamic variable processing page to job fair
Added support for device detection with mobile esp.
removed unused stuff
removed unused stuff
memory optimizations
improved camera
memory optimizations
code cleaning
zajebiscie w miare
cos sie pojebalo
some things added

Signed-off-by: Dennis Lampert <oele3110@hotmail.com>
fix add entry logic
替换图片浏览模块
Merge pull request #50 from passerbycrk/master

替换图片浏览模块
Ensure the archiver task triggered via a model notification still works even if there is no web user present and the paste registry isn't set up yet. This is needed for the harvester to run for example.

* Catch template context errors such as "No object has been egistered for this thread" errors and use the site user if they occur
* More detailed logging
Merge branch 'release-v1.7.1-dgu' of https://github.com/datagovuk/ckanext-archiver
Corrected Test Cases
Finished test cases
Algoritmo de la serie Fibonacci
add proximal method to Form
changed config items to better support idk functionality.  should not affect any systems other than IDK.
Merge pull request #131 from unwin/master

changes to idk.yml.  will not affect other subsystems.
Luke: adds compare stream_def interface
Added Barkeep embed with better streams
added a line to readme.txt
require parameter
fix image max-width
add place layer group back to the map
Add pins for transportation centers, and a different color for the njt river line
Move the "I would bike here..." button to the survey, and update the styles.
Add the CSV with transportation centers
Merge branch 'master' of github.com:openplans/shareabouts into sa-web
Corrected Mod URL
Status bar
Merge branch 'master' of github.com:orionsource/VKProject
привязка визуалки к избранное
Update pom.xml to use Maven exec plugin
changed README to .txt
removed README.rtf
Update README.txt
Changed folder names
CLIPPINGS update
Added Instrument example
EXTRAS update
TEMPLATES bug fix
LIBRARY minor fixes
3 New clippings
Added Instrument example
OI-EXTRAS _developer update
OI-EXTRAS overview update
OI-TEMPLATES update
OI-LIB add-ons and fixes
minor fixes
Minor fixes
Minor fixes
Minor fixes
Fixed loading a matrix file
Tiles size changed
Update JS style with CSS classes

Another .css to .addClass change. There are going to be more of those on my way to rebuild this tiny monster.

Signed-off-by: Patrick Kontschak <patrick.kontschak@gmail.com>
Update LESS mixins

I noticed that not only border-radius was used so often without mixins but also box-shadow. New clases are .box-shadow and .inner-shadow (for inset shadow). There are still a few box-shadows with both normal and inset shadow. I have to think about separating them or making a fused class e.g. .full-shadow or something like this.

Signed-off-by: Patrick Kontschak <patrick.kontschak@gmail.com>
Adding circulations scaffold and rounding out a lot of the basic object hierarchy.
win7 fix button
Лишний namespace;

класс ini
Updates to State of Mozilla

* Bug 812206 - modal overlay z-index
* Bug 812338 - add link to /contribute
* Bug 811477 - alt text for video images
* Switched inline images to media function instead of the MEDIA_URL constant.
* Added hreflang to several links.
* Bug 812338 - Add Get Involved link for en locales
We can display this link to more locales once the Get Involved page is localized.
Merge branch 'state-of-mozilla-updates' of git://github.com/craigcook/bedrock into craigcook-state-of-mozilla-updates

Conflicts:
	apps/foundation/templates/foundation/annualreport/2011.html
Bug 816565 - home page video promo
Bug 816565 - Updated video screenshot/button
Bug 814203: Fix IE6 issues.
Merge pull request #546 from craigcook/bug-816565-home-fundraising-promos

Bug 816565 - home page video promo
Bug 814203: Readd bg image for new-b test page.
Bug 814203: Fix phone view of new-b page scene2.
Bug 820974: Update GA experiment id.
Add initial apache config files.

Fix rule for bug 821006.
Merge branch 'add-apache-configs'
augment <title> tag
JBTM-1100, JBTM-978
gitignore
bugfix: typo in calibration output
Eclipse .project files don't belong in git repo
make TF broadcasting optional
changed dock name
charset changed to UTF-8 NO BOM
working example (without coffee script and tests)
bugfix: better test data generation
Raise ApiFieldError on invalid datetimes
Merge branch 'invalid_datetimes' into pk
BE: add js date formatter plugin
Fixes IE7 crash when pasting HTML
Microoptimizations

Profiled pasting content into IE8.
Microoptimization

Only check firstChild and lastChild in nodeList once
Fixes IE7 browser crash

When docSelection.type == None and docSelection.empty was
performed, IE7 would crash.
Fixes javascript error
Merge branch 'dev-jqueryui-ultra' of ssh://github.com/alohaeditor/Aloha-Editor into dev-jqueryui-ultra
Fixes indentation
Speeds up delete ops significantly
Fixed few bold tests with invalid expectations

Conflicts:

	src/test/unit/commands/bold.html
Fixed few more expectations that had different expectations from the editing API spec
Always pass the range as Aloha's command expects to have range defined explicitly
Excluded 2 tests from webkit due to cursor positioning inconsistencies in webkit
Alter the boundary points if the boundary nodes are not text nodes (issue introduced from the commit 98e1dddb4d)

Conflicts:

	src/lib/aloha/engine.js
Excluded couple of test cases from webkit due to an implementation bug in range selection
Removed repeated DOM element selection tests, leaving only a general
case.
General test case was also skipped from Webkit and MSIE; as they fail to
set an offset to empty elements in a range.
Added a stylesheet for classes required by command tests
Modified engine.js to fix the failing tests in outdent command

Conflicts:

	src/lib/aloha/engine.js
	src/test/unit/commands/outdent.html
Fixed the tests for insertorderedlist and insertunorderedlist commands

Conflicts:

	src/lib/aloha/engine.js
	src/test/unit/commands/insertorderedlist.html
	src/test/unit/commands/insertunorderedlist.html
Reverted a change made to splitParent method and updated a test for outdent command
Fixed issues of insertorderedlist and insertunorderedlist command tests in IE
Explicitly close database connection, rather than waiting for connection to time out
remove global variables for body
May as well add author (mine) information
This library is already included prior to here
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Merge remote-tracking branch 'origin/master'
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
Translated using Weblate.
[https://issues.jboss.org/browse/PLFED-333] Changed to use the new logging structure.
Merge pull request #105 from pedroigor/master

[https://issues.jboss.org/browse/PLFED-333] Changed to use the new logging structure.
PC push pigmalion branch to server
PC merge with atr0x-branch
PC good local db connect all merge with Atr0x branch
PC html template in classic
PC work merge
PC merge probe
PC left icon sprite html
PC html main width etc..
PC html right poll
PC html main page without bottom news
PC html main page ready
PC html news page ready
Merge branch 'master' into pigmalion-branch
PC chmod to runtime
ben ik nou gek
kanon heeft ook de standaard fw
fixed a bug i introduced in last commit that would break the info pull when no song was playing. more error checking of current state implemented
additional feedback for self queued songs, tracking dj downrates now, navbarinfo now shows leaves and listeners (although listeners is static right now... more to come on that)
OrderSpecifier is created by using the query class instead of building it manually
helpful comment changes for debugging
Updated testing code.

Signed-off-by: Stijn Brouwer <stijn.brouwer@null.net>
dodany sprite eksplozji
Merge branch 'master' of https://github.com/pmandes/gdx-airstrike
Conflicts:
	airstrike/src/pl/madsoft/airstrike/screens/GameScreen.java
add wrapper for a start
add note about underscore-preixed properties
add side-effects section with brief example
Merge branch 'psr-1-style-guide' of github.com:pmjones/fig-standards into psr-1-style-guide
adding touch requirement back in
Initial commit
adds Shapefiles and GeoJSON files
removes all.json
adds .DS_Store to .gitignore
removes stray shapefile
Merge branch 'master' into gh-pages
Github pages with index of all maps