labofsahil/github-event-dataset-2012 huggingface dataset:
hiredis 0.11.0
ngspice: add X11 dep
opencolorio: use new dsl
mkvtoolnix: patch to build with #define foreach BOOST_FOREACH

mkvtoolnix uses #define foreach BOOST_FOREACH, which breaks the build
due to an issue with header file ordering.  Boost 1.49 was patched
to avoid this issue, but the patch was removed in 1.50, so the mkvtoolnix
build must provide a workaround.

See: https://svn.boost.org/trac/boost/ticket/6131

Closes #14568.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
open-scene-graph 3.1.2

Upgrade open-scene-graph to version 3.1.2.
Remove that patch that is merged into this version.
Add a `--docs` option. Don't build them by default.
Add deps on doxygen and graphviz if building docs.
Install the docs into the correct path.
Add a dep on gnuplot.
Add a dep on gtkglext.
Add an option to build ffmpeg support. It is off by default.
Make the ffmpeg dep conditional on the option.
Use inreplace to turn off ffmpeg rather than 10 CMake vars.
Actually build the docs using `make doc_openscenegraph` if asked.
Remove the `fails_with` because it works now.
Add a patch to fix a syntax error during `cmake`, missing OR.
Change to 10.7 specific cmake code to `10.7 or 10.8`.
Reported upstream and noted removal date in comments.
Tested on ML using clang and llvm from XCode-4.4.1.

Fixes #13840

Closes #14563.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
superenv: look for pc files under prefix, not repository

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
vanity urls
vanity urls
added omim statistics queries
ctd and drug bank queries
Candidacies are saved in own collection

Candidacies are now saved in own collection and population of candidates
for admin submodule is done manually as populate method won't work for
paths that are three levels deep with the frist and the second level are
arrays.
added menu blocks
task setup and map shell work. WIP
Deleted build folder :)
Allowing an arbitary filename extension
Version bump to 0.3.2
Version bump to 0.3.3
Adding Client side caching
Readme, requirements, settings
1.5.3 release. https://aws.amazon.com/releasenotes/PHP/0506912310171832
Setup Google Analytics.
"Fork me" ribbon.
nipype_preproc_spm_utils.py: added plots of cv_tc diffs
nipype_preproc_spm_utils.py: added html report generation
emergency commit
Add Linux time
Help dialog message changes
Renamed allTaskDeclStatements to taskNumberToTaskDeclStatement
getReturnType changes
Renamed computeBaseCaseStatements to createSequentialMethodInvocation
Renamed tooFewStatementsToRefactor to hasNoRecursiveCal
Renamed switchStatementError to hasSwitchStatements
Changed default FJT class name from Impl to Task
suggestSeqThreshold changes
Addition of TODOs and renames
Merge pull request #100 from dorkster/bugfixes

Fix empty equipment slots not being highlighted during dragging
initial commit
Merge branch 'master' of https://github.com/drconway/csci333-lab1
change the return true to return this
change arrayobjects return true to return this
disable abstract session , all move to session and add session interface
delete use method, it is excess
add session storage interface and and get method in this to save session
change the session example
update the value of the session pater to peter
update readme
Added new awesome logo by CycloneSweetie
Update docs in lessbuild hooks
ReservationTest added
Merge branch 'master' of https://github.com/dujuanxian/biblioteca
Refactoring and begining of deployment handler programming...
add new fonts for h1 and h2
jetty-9 SelectorManager refactorings.
Set session store back to default, as domain: setting does not appear to work.
Change LZO compression
cpufreq_pegasusq.c: Adjust hotplug frequency for GNex
Create the eventhandlers folder before we put stuff in it.
remove dummy app
s1
Merge branch 'sprint2' into sprint3
added readme, fixed cv content
fist stub working!
comments
going XDM with sockjs
removed tastypie
return match details for debugging
bogus tests for tracing
stringify error messages
more travis-specific tracing
dismiss toxic path elements
remove element which may be set to $HOME
remove bogus travis tests
closer look at remaining travis-specific failure
more travis experiments
whitespace
let*
only return strings from -extract-strings
avoid env variable
make sure compared paths have equivalent expansions
add ignoramus--extract-pathstrings
test i-matches-datafile when file does/does not exist
extracted pathstrings are always expanded
refactor
comment
remove bogus travis-specific tests
bump version
Fix test Case
ENCUESTAME-361 New service to get total use by tweet poll, poll or survey on a particular date range.
Test Cases - ENCUESTAME-361
ENCUESTAME-361 New service to get total hits usage by has tag name and date range
Test Cases ENCUESTAME-361
Remove unnecessary parameters
New json hashtag statistics service. ENCUESTAME-361
Test cases for json service ENCUESTAME-361
Route to code coverage-reached 54%

BaseLogger-100%
NullLogger-100%
BaseThread-98.5%
added systemd support
code cleanups; defined and use ARRAY_SIZE
contrib: updated udev rules for systemd; dropped upstart support
use correct socket fd
flush and configure both event sources
we get the listening socket; not the accepted one
refactored listening code and added some error checking
use systemwide systemd
implemented uinput mode; enhanced parsing of cmdline parameters
minor cosmetical and logging cleanups
enhanced makefile a little bit
fixed compiler warning
initial checkin of udev helper
updated udev + systemd files
support only uinput mode
load uinput module
fixup! support only uinput mode
improved installation of contrib stuff
patches: initial checkin
Added travis image to Readme.
add susy twitter link
setZIndex now correctly reorders layer canvases
Add HTML header snippets
version
Add brush buttons
Add eraser brush
Undo works with eraser
Add nameable frames
Basic page loading and saving
-
Found my bug, pushing all my lookups for user and app through find now to produce more controlled results.
Slight modification to pushover to show usage.
Updated my whatsnew for merging and the Gemfile for yardoc deps.
Fix for https://github.com/esmasui/AndroidJUnit4/commit/9f678ee8b8adc14ee7c8c5a04de935e814e649d6#commitcomment-1886390
Disable parallel computer
Give a better error when a subgroup is null.
Include the GM version when logging errors.
Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Move max-tempban-time in config
Adding permission node to speak, with config option to enable the node
accommodating partitions named DISKn as well as those named DISKpn; shortened cache purge routine
added fault and logic for db resource checks and used Swathi's ExecutorPool code for DiskResourceCheck
Merge remote-tracking branch 'remotes/origin/team/trouble' into dev/ethomas/team/trouble/09-20-2012
Merge remote-tracking branch 'remotes/origin/testing' into dev/ethomas/team/trouble/09-20-2012

Conflicts:
	clc/modules/troubleshooting/src/main/java/com/eucalyptus/bootstrap/TroubleshootingBootstrapper.java
	clc/modules/troubleshooting/src/main/java/com/eucalyptus/troubleshooting/resourcefaults/DiskResourceCheck.java
added some testing for db connection overflow (will remove), fixed 1006.xml
removing code that automatically spawns lots of db connections
user management patch
constants problem
broadcast message that was posted via http
Specify node-package branch in repository:url metadata.
npm package v0.1.8
修改控件
添加控制按钮
Allow value dependent constant expression initializers in the body

// Value dependent constexpr variables in bodies
    // of generic lambdas pose a special case -
    // template<class T> struct X { enum { value = 0 }; };
    // auto L = (auto a) {
    //   using A = decltype(a);
    //   constexpr bool b = X<A>::value;
    // };
    // Since generic lambdas are essentially member templates
    // but their bodies have to be parsed and have semantic
    // analysis be performed upon definition
    // A term such as constexpr bool b = X<A>::value;
    // might be indeed be a value dependent expression
    // and should not be marked ODR used, but as we are doing
    // this check, we have to be careful because
    // checkInitIsICE() asserts that the initializer
    // can not be Value Dependent.
added .js to main property in package.json
Merge pull request #237 from fisch42/master

add .js to main property in package.json
Scanner returns empty string if it can't match
Merge remote-tracking branch 'upstream/master'
Fix JSHint warnings
Added 3-level deep nesting test

Fixes #42
Move views before templates in examples
Remove ignored argument
Version 0.5.2
Moved check for partial compilation from Renderer.prototype.compilePartial to the compile call itself.  Allows user to expect a compile operation with an explicit .compilePartial call, while still only requiring a partial to be compiled once per Renderer instance
railscasts funcionando com 256color
Modified Code, so that it's a little bit less 'hacked'
di toro
Fix loading of multiple video streams
transaction is complete including calculations if not set.
getStatus doesn't work unless you call it though
cleaned up debug info in TicketDetailView
adding start felix project
Added Arrays, printing and do blocks.

-Arrays are now implemented.
  -create empty arrays with []#dim1#dim2#...
  -create initialized arrays with [exp1,exp2,exp3]
  -array indexing works as well.
    -I believe currently only full indexing, cannot get reference to inner array.
-do blocks
  -for loop syntax changed, removed mandatory do
  -syntax for do blocks:
    do
      statment1;
      statement2;
      ...
      statementn
    end
-print 4 is now a valid statement and returns the result of the printf function
Merge branch 'fix/wiki_menu_item_include_children' w/o pull request.
Using already loaded information if available

Falling back to light-weight loading if information was not already present
Micro-optimization - no initialization when admin
Load user memberships by default

since nearly every view will check permissions, eager loading memberships might
be a good idea.
Optimization: Avoiding save if nothing changed

this should avoid more callbacks being triggered and should therefor improve
performance
Extending API of recalculate_attributes_for

This way we may not need to fetch an entry from the DB, where an existing object
is already present. This might be of special intrest, when plugins alias-method
chain recalculate_attributes_for and want to save a separate save call.
Perf opt - touching journaled w/o callbacks

Initially the journaled was only touched on journal creation to make sure, that
journal updates, that do not update the journaled element itself (like adding a
note) cause a change in updated_(on|at). This has gone a bit overboard, since
simply touching the journaled causes a roundtrip to the db and triggering of all
save callbacks on journaled in all cases.

These changes try to avoid the db roundtrip by only saving when things actually
changed and avoid triggering the callbacks by using update_all instead of save.
Making test more generic

I don't know why the behavior changed with the last commit, but [3,4] has now
become [1,2]. Therefore, I'm reducing the specifity of this test, to only check
if parent has no children. Also, since the root is the issue itself, the default
lft and rgt values should have been 1, 2 anyway and the tested behaviour
seems to have been wrong in the first place. This seems to be confirmed by
the fact, that redmine tests for [1,2] as well (see
http://www.redmine.org/projects/redmine/repository/revisions/6311/diff/trunk/test/unit/issue_nested_set_test.rb)
Make wildcards beginning with dots not match . and ..
https://github.com/fish-shell/fish-shell/issues/270
added back in google analytics tracking code
Add Whole Foods cola to README.
Merge branch 'master' of github.com:fiveplusone/hskitchen
Added ssmtp settings for dev and prod
Update puppet submodule.
First stab at using js object literals to make the code more modular
Moving keys array inside Chip8 object
Adding var declare for Chip8 per JSHint
Cleaning up code to make JSHint happy
Merge branch 'master' into oopy
Merge branch 'master' into oopy
Fixing test for 0x8XY3
Standardizing array declarations to []
Getting rid of ROMC hack
Re-adding lost fontset load to fix #3
Merge branch 'master' into oopy
add back background option
text module
git ignore: credentials & pycs
layout refinded, compass included"
"
add some fmpcb helper functions; edits to documentation
initial code for the Hurwitz zeta function with derivatives
- Update to version 0.12.1
- Remove ABI number versions from LIB_DEPENDS
- Add missing dependencies
- Fix GG_EMOTS option, don't patch CMakeLists.txt
  instead use COPYTREE_SHARE to install all files
Update to 3.1.2.

PR:		ports/171785
Submitted by:	Richard E Neese <r.neese@gmail.com> (maintainer)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304757 aed309b6-a8cd-e111-996c-001c23d10e55
- add license (MIT)

PR:		171620
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (maintainer)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304230 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 4.1-ESV-R7

Approved by:	Douglas Thrift <douglas@douglasthrift.net> (maintainer)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304231 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 0.9.4

PR:		ports/170622
Approved by:	maintainer timeout (clsung, >5 weeks)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304708 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 0.9.7

PR:		ports/170623
Approved by:	maintainer timeout (clsung, >5 weeks)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304709 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 0.1.9

PR:		ports/170625
Approved by:	maintainer timeout (clsung, >5 weeks)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304710 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 3.6.0

PR:		ports/170637
Approved by:	maintainer timeout (clsung, >5 weeks)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304711 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 0.3.1
- Fix plist
- Bump portepoch (beware of illegal portversions)

Approved by:	Aaron Voisine <voisine@gmail.com> (maintainer)
* Add support for running multiple instances of openvpn to the startup script
  Inspired by [1]
* Bump PORTREVISION
* Update the comment which says not to send notices about 2.0.8 to 2.0.9 since
  2.0.9 also introduces only Windows changes. Remove maintainer's name from
  this comment since he did not explicitly state this.

PR:		ports/108371 [1]
Submitted by:	Denis Shaposhnikov <dsh@vlink.ru>, Gleb Kozyrev <gkozyrev@gmail.com> [1]
Approved by:	matthias.andree@gmx.de (maintainer timeout, 28 days)
Update to 0.8 release.

Requested by:	maintainer
- Update to 1.1

PR:		ports/109441
Submitted by:	Adam VanderHook <acidos at bandwidth-junkies.net> (maintainer)
- Update to 1.03

PR:		ports/109443
Submitted by:	Jin-Shan Tseng <tjs at cdpa.nsysu.edu.tw>
Update to 0.53.
Typos.
Update to 5.3.1.
Update to 2.1.2-22 which has been around for a while, and fixes a number
of incompatibilities with recent versions of GCC.
Update to 0.21.4 (distversion 0.214)
- Update to 1.17
- Remove 4.x cruft
- Fix a typo.

Reported by:	kris
use $() instead of ``

Requested by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
- Fixed RUN_DEPENDS on www/py-clientform
- Bumped PORTREVISION

PR:		ports/109453
Submitted by:	nivit (notified by pointyhat, via kris)
- Updated to 0.1.6.b
- Added pkg-plist

PR:		ports/109454
Submitted by:	nivit
- Update to 2.2.4
- (Re)add the sql dependency trigger. [1]

- Don't clobber BUILD/RUN_DEPENDS if no QT4_COMPONENTS are specified. [2]

Submitted by: [1] Danny Pansters <danny@ricin.com>, [2] nivit
Update of gforge from 4.5.11 to 4.5.16
- added support for jpgraph2 if PHP 5+ is used

PR:		ports/109458
Submitted by:	Martin Matuska <martin@matuska.org>
Upgrade to 2.2.1.
Update to 20070203.

PR:		ports/109373
Submitted by:	"Herbert J. Skuhra"<h.skuhra@gmail.com>
Approved by:	maintainer
Fix build on non-x86.

Submitted by:	jhibbits
Obtained from:	http://anonscm.debian.org/hg/xine-lib/xine-lib-1.2/rev/b0df4b6003ad
- Work around graphics/ilmbase pthread-related brokenness to fix build

Reported by:	beat@
- Update to 0.08

PR:		ports/171102
Approved by:	Vick Khera <vivek@khera.org> (maintainer)
- Update to 1.54

PR:		ports/171101
Approved by:	Vick Khera <vivek@khera.org> (maintainer)
- Update to 0.29

PR:		ports/170969
Approved by:	TAKAHASHI Kaoru <kaoru@kaisei.org> (maintainer)
- Update to 0.14

PR:		ports/170968
Approved by:	TAKAHASHI Kaoru <kaoru@kaisei.org> (maintainer)
- Update to 2.0008

PR:		ports/170958
Approved by:	Mohacsi Janos <janos.mohacsi@bsd.hu> (maintainer)
- Update to 0.04

PR:		ports/170929
Approved by:	Frank Wall <fw@moov.de> (maintainer)
- Update to 0.15

PR:		ports/171087
Approved by:	"Schmehl, Paul" <pauls@utdallas.edu> (maintainer)
- Update to 249

PR:		ports/171088
Approved by:	"Schmehl, Paul" <pauls@utdallas.edu> (maintainer)
- Update to 3.316

PR:		ports/171063
Approved by:	otacilio.neto@ee.ufcg.edu.br (maintainer)
- Add VIRT and WRITE_HTTP options [1]
- Convert to new options framework [1]
- Remove ABI versions from LIB_DEPENDS
- Fix build with Clang by using upstream patch [2]

Upstream fix:
	https://github.com/collectd/collectd/issues/49 [2]

PR:		ports/171204 [1]
Submitted by:	Krzysztof Stryjek <ports@bsdserwis.com> (maintainer)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304166 aed309b6-a8cd-e111-996c-001c23d10e55
Update to 283

Notified by:	gahr
Feature safe:	yes
Add mapping for route 'rate_caches' :action 'index'

This patch makes the 'Administration' menu render as expected with Redmine 1.4
Revert "Fixed pagination"

This reverts commit 7b026140c358cb4f846dca6d5a9eed031755491e.
Tic Tac Toe Swing
comment print message
Cleanup/Installed Mongoid into the project
Added Guard and RSpec
Updated the gems
Fleshed out the User model
Added the label model and fabricators
Let Devise use Mongoid
Behavior for HomeController#index
Quiet down override_urls() warning.
added basic image slide support with new example to demonstrate this
fix a bug of use equip who has skill hongyan
fix longnu
./mocha.sh is here to save the day, yeah.
Trying to sort out shitty git errors
more shitty errors
implemented graph changes
Merge branch 'graphchanges' into next
continued refining checkers simulator

attempting to get a simple game like checkers working as a concrete
game simulation that the rest of the framework can be reliably designed
around
tela home 100% + models de examesa
Opening Multiple Documents
add Konrad Hinsen's blog
add clojure feed from oreilly blogs
Added auto-select of text in generated HTML code.
Improved legibility of uninstall text.
rebuilt headernav script
first commit
Merge branch 'master' of https://github.com/giscdhssg/bankaccount
Add an "Analyzing" repo state
Hidden useless controls in Gallery
Updated pages styles
disable flymake.
Various fixes to scanning.
Some fixes to the scan process.
Tweaks thumbnail page styles.
Fixed omniauth-facebook issue, rollback to a previous working version 1.4.0, facebook connect done and tested.
Fixed ralated issues with Twitter and facebook buttons, NOTE: In order to make a  tweet and share it with the post url, in localservet , must modify the etc/hosts files ex 127.0.0.1 mysite.com do this only for test , when finish comment the added line 127.0.0.1 mysite.com
remove partials in some layouts to reduce load page, add/remove quicklink while install/uninstall module
Remove some logging from the last commit
config: add a warning about ENABLE_GZIP_OUTPUT potential breakage
Added ifndef statements to riemanntheta.c
added fedora source rpm package for the_silver_searcher
don't crash on params when updating project
Associations are not sortable by default
Added unit tests for association sorting
Merge pull request #1543 from diasjorge/issue_774

Associations are not sortable by default
Bring gitolite.rc template in line with upstream changes.

This fixes a permissions bug in 3.0
https://github.com/gitlabhq/gitlabhq/pull/1719
Committer: greskosa
Update notes for submitted changes

* Fixing up the _reset_host periodic task
Modified writeOut method of SensorData to take in input a string. This string
should be the name of the file .g2o where data is written.
make database always be clean and available
bundlerify
Merge pull request #14 from grosser/bundlerify

bundlerify
Merge pull request #16 from grosser/database

make database always be clean and available
Added convenience function for timer input selection.
Added functions for timer input capture polarity and enable/disable.
Added functions for configuring timers in slave mode.
EM algorithm for 3-component gaussian mixture distribution
ajeitei o US02, tinha uns espacos nas listas q quebravam o teste
US02 está passando em metade dos testes (32) sem pbls. Coloquei os ids
para serem string no lugar de Integer.
StateMinhasCaronas, mudança de Window.alert para PopupInfo
note about multiple conditions
removed tests related to SumPerGroundMotionField
Fixing failing qa test, docstrings, pep8/pylint cleanup
solving merge conflict
fixing pep8 issues
Merge branch 'insured_losses' into insured_losses_qa_test
small fix
Fix HQMF V2 parser to work with ballot schema
Bug fix: added one argument
Added starChat.Notification
Refactoring
Show a notification when a keyword is included in a message (#77)
Merge branch 'release/0.3.9'
Modified reconnecting time
Bug fix: scrolling
Bug fix: redefined self
Added annotations
Sets background color of gvim windows

Sets background color to match the background color of vim buffers.
This makes windows look a little nicer when vim does not quite fill up
the entire window, leaving white strips on the bottom and right sides.
XMonad configuration improvements

* pulled Flip layout modifier into a separate module
* send chat windows to workspace 3 when they open and mark as urgent
* use MirrorShrink and MirrorExpand to make secondary windows resizable
* puts workspaces 1, 4, 7, and 8 in left-handed mode
Adds `git lg` shortcut for a nice log format
Adds .vim/.netrwhist to .gitignore
convert to JUnit4
convert to JUnit4 test
merge
Merge branch 'master' of github.com:hansson/ExamensArbete

Conflicts:
	main/selenium.tex
mostly spelling error fixes
ie8 bug fixing.
removed license heading
trying to refactor caching functions
Merge pull request #96 from he116ra1n/improvements

Started factoring the a cache function
Merge branch 'gsoc2012' of github.com:cidadania/e-cidadania into templates

Conflicts:
	src/apps/ecidadania/debate/views.py
Changed gameplay to be positive scoring and play forever
No glFogi().
No X.
add native dynlink to osx
update versiontag
small side list refactor
nu med de tegn som git heller ikke kan vise
added content and styles to contact page
Merge pull request #55 from honkdamonk/master

GM-Map
A more universally accepted format of typeof.
Refactored atomic operations to platform-specific files.
Further refactoring of atomic and synchronization promitives.
Removes warning generated by some compilers.
Not all compilers support OpenMP conditional parallel region syntax.
Fiexed name clashes with variable names experienced on some platforms.
Created a simpler version solving problematic support for OpenMP conditional parallel regions. Corrected a previously missed local variable name change.
Merge remote branch 'pullstream/master' into benchmark
Fixed bug: nodes are not supposed to be references....
added tests
added warning when having implicit type conversion for keys
added check for target graph for keys and values for maps
added tests
Merge pull request #65 from honkdamonk/master

Added Readme for examples
Test script now searches for strings representing both gcc and g++ when verifying existence of the tools.
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl
Avro support is now compiled into a separate library and controlled from the common setup file.
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl
removed warning
Moved atomic reductions to back-end library. Removed code generation for some reductions in compiler.
Added small optimization for atomic-add and atomic-multiply
using batch request to retrieve contacts
forcing generator to run
Replace core files with translated version.
fix page turnning in lanscape mode for crereader

the panning step should be twice of screen height in lanscape
because crengine will render in two-column mode.
Adding function qlook upcoming in bibdesk (ctrl+alt+cmd+space) to preview next file to be autolinked with Ctrl+alt+cmd+L
Change-Id: I704b91a5d4fa75446a225aef19440cb188261c08
embedding jalbum
eliminado quipus
Enabled streaming of theme music
Added everything to index and started preparing for nicer-looking
GameOverState
Add -x option to get map for specific lat,lon pair
fixing song name and path allocation in startlocal()
Looser mocha dependency
Added MTM2012 Arrows project pipeline diagram
test the cmd
refactor: use file-seq instead of listFiles - includes the path passed in; listFiles does not
gitignore classes dir
Readme file updated.  Need to add quick start guide.
Merge branch 'develop'

Conflicts fixed for:
	README.md
FLEX-70: contact commenting
fix merge conflicts
Merge pull request #11 from ifightcrime/flex-70

FLEX-70: contact commenting
added my bio
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
trying to merge
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
Still trying to merge
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
still merging
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
merging
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
pulling
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
pulling files
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
pulling files
Merge branch 'master' of https://github.com/iguananaut/uh-sandbox
manifest_version修正
update library link
resolve conflict @ lib-qtLogger link
added flash, flush, merge, replace
Modification des url des images qui ne s'affichaient pas
Almost done, RC1 would say!
enable backup, fixed tags folders
add install.sh.  add a default backup folder
small change
updated YankRing submodule (ah?)
submodule correct mispelling
api: .getGateway() method
0.2.1
Tidied up the added stuff so it compiles correctly
Work on postprocessing begun
Fixed typo @hasresult if statement
added basic timer and nvic definitions
added basic irq driven timer16 example and reusable r0ket init code
skew added
Fix for BZ 831966: Added link to missing connection hook.
fix for bug#833340: support same district move
Merge pull request #154 from mrunalp/master

Fix for BZ 831966
Merge pull request #155 from rajatchopra/master

Fix for bug#833340 - support same district move
Fix for bug 830642
remove base m2_repository
Merge pull request #156 from abhgupta/abhgupta-dev

Fix for bug 830642
Enable ruby-1.9 cartridge is list of frameworks, bug fixes + cucumber tests.
Updating gem versions
Automatic commit of package [cartridge-jbossas-7] release [0.95.3-1].
Automatic commit of package [cartridge-jbosseap-6.0] release [0.2.2-1].
Automatic commit of package [cartridge-mysql-5.1] release [0.29.2-1].
Automatic commit of package [cartridge-mongodb-2.0] release [0.22.2-1].
Automatic commit of package [cartridge-ruby-1.9] release [0.2.2-1].
Automatic commit of package [rubygem-stickshift-controller] release [0.13.2-1].
Atualizando a pasta src
Mudança nas permissões
extensive mysql coding to get this "fork" thing working.

	modified:   database design
	modified:   fork.rb
	modified:   initialize.rb
	modified:   public/editor/editor_files.js
	modified:   public/editor/plugin_sequence.js
	modified:   upload.rb
	modified:   userman.rb
	modified:   views/editor.haml
VIBR / BVBR, from tpt++

final version, I fixed BVBR in this
fix tpt bug where thumbnails would not continue loading if they had timeout'ed. Make the save browser load them faster too
Execute proxy for minecraft.

Signed-off-by: Jacob Santos <jacobsantos@jacobsantos.com>
Simplify
On the way to implement required calls examples
Initial classes and project files.
println in Tests auskommentiert
Merge branch 'develop' of github.com:jakob190590/ScotlYard into develop
Removes unused led pins
Removes unused pin delocrations
Lots of changes
Adds Debug and Playground files
Chooses between calculate algorithms based on distance to nearest ghost.
add mailer plugin
add logging
should find loccages near by location and distance of 2500 meters
Added mergesort package.  Updated Part II code to include up to Step 3
of Kruskal's algorithm.  Nothing has really been tested at this point,
and error checking has not been put in yet.
Conflits résoluts
Added CNAME, modified menu links for GitHub
fix html entity relplacement
Add referrer=xbmc for Drew's benefit
Add necessary files for release.
Remove caching until xbmcswift2 bug is fixed.
remove programme.md
Try catch added when there is no active welcome screen at startup
Merge pull request #11 from jjankovi/issue10

Fix for Issue10
JsonUtils: Added conversion Java -> JSON
Finished ProcSimpleMethodHandler
JsonUtils: Small enhancements
Populated Browser with ProcSimpleMethodHandler.
Removed obsolete ProcSettingsRequestHeader.
Upgrade to jclouds 1.5.0-alpha.1
[maven-release-plugin] prepare release jclouds-karaf-1.5.0-alpha.1
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] rollback the release of jclouds-karaf-1.5.0-alpha.1
refactored decrement rate to int from double
Added a settings class for the GHLayoutGenerator.
Puedes eliminar el curso y sus relaciones [Delivered #34570749]
No permite navegar en contenido si no lo ha aprobado previamente
Adding twitter service to the API
release de jelix 1.3.4
Gitconfig: update gitconfig.
classifier: done
Merge branch 'master' of github.com:jensa/BloggEllerNyhet
Reapplying change clobbered by Matt's checkin.
Uploading to github
uploading
moved the status and boolean filters into their own modularized views.
seven style
update ignore
add Gem
add gem
typo fix
update Gemfile.lock
install rspec
add Guardfile
add .tavis.yaml
update spec_helper.rb for capybara
add bootstrap's
add erd
adding towertactics to repo
Merge branch 'master' of github.com:jimZhenG/Puzzling.com

Conflicts:
	SDKs/ios/PuzzleSDK/PuzzleSDK/Classes/SDK/Public/PuzzleAPIKey.h
Remap arrows to something more useful
Updated the README and made slight modifications to the earlybird config file
Revert "xiaoyu 3-23-20:57"

This reverts commit 90676dfb46982250d0dafe7f113ee1c23f095d6c.
Added internationalization to various files.
Meant to add tags, not categories.
Mejor soporte en texto RTF, asi como formulas con superindices, subindices, fracciones, sumas e integrales.
Las funciones de escorrecto y esCorrecto, ya funcionan adecuadamente con los patrones de respuesta de los campos de texto.
El parametro de ancho en los textos simples, ya funciona.
La importacion y exportacion de variables entre espacios del tipo AP, funciona.
Correccion en los colores que tienen expresiones.
Times for the heading, some margin fixes
Shell-agnostic screenrc
Add rvm bin to PATH under zsh
Alias to list 'human' file sizes
Abbreviation for 'git branch'
Enable autocorrection
Don't give glob errors for remote scp globs
Improve git shortcuts
More scroll history for screen
No more vim keybindingds in zsh
Source other files after aliases, to allow overrides
Handy shell method for date time string
Simplify status line and remove spaces
Add a remote screen and shorten names
Add an alias for listing all files, name only
Move functions to a separate file
Add more bundled commands
Remove the git: prefix
fixed bug with obj
Made if block more readable
Comments sorta work now
add comments for source
Set pk to use auto-increment
Adding ability to suppress @import statement creation through the no-imports parameter.  @import statements are not always the best option for performance.
Added GUI for streaming to a RTMP server.
Merge pull request #10 from joncode/master

admin navbar working
Merge pull request #11 from joncode/master

if statement in layout for jonbumper
admin navbar styles from Jon
guitar page styles
Merge pull request #7 from robertSahm/master

Guitar and Bass styles getting a foothold
few things before renaming repo :)

Signed-off-by: Chris Jones <chris@jonezy.org>
deleted some useless files
added a test shape
correction in bc of the sides when element has unit thickness
minor corrections
Fixes an issue with using paraView
Merge branch 'development' into meshing
Merge branch 'meshing' of https://github.com/jonkomperda/SimpleMAC into meshing
Dramatically speed up Chronicle by caching the parsed eras
from validation added
Modified jquery and sylvester to load with AMD
ENH/TST: SequentialOLSQR  add tests (not full coverage)
Updated ctrlp and added NERDTree
Fix documentation and usage strings.
Bumped version since this marks a usable version
removed vim plugin before changed manager from bundle to neobundle
changed vim plugin manager to neobundle
Ok, almost there
Ok, its working. I think.
Make ship slightly bigger
Fixed redirect loop login
remove ecliipse dependencies and add cmakefiles
Fixed typo.
Renamed packaging to tangibles.
Renamed packaging folder to tangibles.
Renamed.
Added the full size print images.
Added print image sprite.
Renamed to match style.
Removed the main street poster.
Added print css sprite.
Removed old file.
Normalized all the file names to use underscores rather than dashes.
DRY'ed the thumbnails.
Using underscore for the classes.
DRY'ed the thumbnails.
Use Middleman's css/js/img directory variables.
Added the web images.
Added the web thumnails css.
Need to use double quotes if we're going to use variables.
Updated with the correct images.
Check if the title has been set, if not just display the site name.
Optimized neighbors getter.
Added multiple cell linking options for testing.
New folder in /media for pdf dox including psalm23.pdf - MJ
add vim-octopress syntax plugin
abstract module cleanup
event manager related
Split out CK2CURLBasedProtocol.
Unit tests don't need to link against libs now either.
added login failure variant of directory creation test
added file deletion test
Relatorio de TDD
gdi を デフォで--color
excel_irof Add
asdasdsa koydm
1
Merge branch 'master' of https://github.com/kazelot91/ZPR_STEGANO
poprawka literowki
Add PS files to .gitignore

PS files typically generated via 'a2ps file.sml -o file.sml.ps -1 -c -f10'
tagging
Merge branch 'release/0.2.47' into develop
making events taggable
Merge branch 'develop' into feature/acts_as_taggable_on

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
Merge branch 'feature/acts_as_taggable_on' into develop
bump da version
Merge branch 'release/0.2.48'
admin mailer fix and deliver call
implemented server socket
Added another throw.
Refactored to use EID smartcard using EID MW on MacOSX.
Make sure proxies have their scheme attached.
Remove silly print statement.
Merge pull request #1071 from Lukasa/master

Proxies should have schemes.
Adding more bundles
Changement d'un nom de methode dans la classe Client
removed uuid library: without a random seed v4 UUIDs were coming up identical; switching to avtobiff's erlang-uuid lib
changed uuid libraries, updated rebar.config accordingly
RPCClient is now async. Will test on bok box.
specs for #23 + cyrillic spec
added note about making pdf
Added captions to the beginning figures
Merge branch 'master' of github.com:killerfriend/womprats
added tests, made template engines modular
Added Guard and FactoryGirl spec tools. Setup Devise. Added Term and Custom Definition models.
Change stop criteria

Signed-off-by: Derik Evangelista <kirederik@gmail.com>
Misc updates, + vim easymotion and syntastic
Base cli command for season management added
Original version
Behavior fix and mousover disabled

The currentItem reported in the original version didn't work correctly
if going backwards and disabled the mouseover effect for items in the
carousel.
added sms future
enable on the fly vp8 bitrate change
ИЗменение кодировки проекта на UTF-8
Черновой вариант страницы со списком каналов
improve typeAhead mgmt
Restored 'love.run()' function in 'main.lua', that handles now love2d v0.80.
Limited framerate to 60 FPS on active console.
Added comments.
Introduced a new actor type, encoder-side-relay, and renamed the old pubsubproxy to forward-relay. Now each island will receive each encoded frame from each flow exactly once. Note, this change introduces a bug that stops PIP from starting up completely. We will fix this soon
wrote inference section of paper
initial import
playing with git pull and moving README text

Merge branch 'master' of https://github.com/kwilkins/grid-matcher

Conflicts:
	.gitignore
map marker updated.
Committee Content List view added.
can show img byte
update grid for ie7 / 8, improve grid naming
Removed spurious warning in automata.c.
styling for page
main styling for page
main page styling
commiting mark up
Fix lintian debhelper-overrides-need-versioned-build-depends occurrence.
Added more signals to the signal table
Fixed bigint linker errors on x86.

This makes the code take the same path as when generating PIC code,
which is supposedly a bit slower because of additional ALU pressure,
but it shouldn't make a big difference.
28Oct2012
修正for循环limit时会破坏原来数据问题
Shunting yard with dice \o/
Needs better output, though
Shunting yard with dice \o/
Needs better output, though
Documentation.
Fail if trap failed.
Documentation
Indentation.
Abort if checkpoint is complete already.
Don't write to logfile in trap function since it is not synchronized with the rest of the script
Documentation
Remove useless semicolon
Move code to a place where it makes more sense
- Instead of having a header on the checkpoint files which tells whether the checkpoint is complete/incomplete, have this statement as an end of file marker. Do not resume computation if the end of file marker is not found. This allows the user to see whether the file was fully written out. It could happen that the process was killed by the kernel while writing the file out if it doens't wait long enough during shutdown for the script to terminate due to SIGTERM.
- Bugfix: Do not load dataset where sha256sum/stat failed into the set of data which we resume from. Recompute them instead.
subiendo faqs de colombia
borrando chile
library(MSnbase)
optimizing demo pages
restructure the /definitions directory

As the input files with command definitions already get too numerous,
I  decided to distribute them to two directories instead: 
- /core (containing the fundamental calculations and proceedings)
- /commands (containing the actual command definitions)

Also update references in the manual.
genGlyphCommands: Allow Python/LaTeX style comments in input file
genGlyphCommands: remove unnecessary local function generate_latex_commands()

This function is no longer used because it is replaced by the one in
lilyglyphs_common.py
(And it wouldn't work anymore because of some changes in implementation)
genGlyphCommands: Change cmd types 'glyph'->'glyphname',  'bynumber'->'number'
Manual: Document use of genGlyphCommands.py
Manual: Remove (comment out) glyphlist images:

I intended to incorporate the glyph list images from Lily's documentation
in the manual (in order to be able to see those glyphs that are possible 
but not yet implemented.
They take up very much space, result in awkward floating of the figures and tables,
and they make less sense now that we have the image commands.

For now the existing \glyphlist figures are commented out, but could eventually
be removed completely.
Add graphical \lilyglyphs command  (to lilyglyphsStyle.sty)

Uses lilyglyphs elements and the Gentium font.
So if you want to recompile it you have to have Gentium installed
rename stash_new_commands/emmentaler/testglyphs to examples
remove stash_new_commands/emmentaler/newGlyphCommands.tex
remove stash_new_commands/images/newImageGlyphs.tex
Update .gitignore: Exclude result files for new commands
Generate lilyglyphs_logo as PNG and add it to README

The PNG version of the logo is located in glyphimages/lilyglyphs_logo
(and tracked)
bug fixes for matlab module
add getValue
idstream instead of stream3
blank
before get rid of them (bad design)
fixed variable length for do-if form
android: add dummy touchscreen driver

Signed-off-by: Fudong Bai <fudongbai@gmail.com>
android: add idc file and sendevent scripts

Signed-off-by: Fudong Bai <fudongbai@gmail.com>
Simple fix in debug message

Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Lance Russell <lancerus@us.ibm.com>
Unlock only if the caller indicates it has lock.

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
Don't return before unlocking.

Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
Check flags properly before opening

Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Rong Zeng <rongzeng@us.ibm.com>
Add I2C support
Hide banner of tympanus. #2
Fixed UADEPlugin.
first commit
Merge branch 'master' of github.com:liuxiaohao/qtweibosdk
fix url for user topics
Pinned lib2.30, threedilib 0.3
Merge branch 'master' of github.com:lizardsystem/flooding
Configured new task CALCULATE_SCENARIO_STATISTICS.
Add standings checker to prevent friendly fire
Support extending version with an arbitrary suffix.

This allows, for example, adding a ".dev<N>" suffix for automated
development builds and publishing these to a local PyPi (such as ChiShop)
in a form compatible with PEP 386.
Renamed modules
Judges per tournament brush-up
Moved field-entityreference code from node-tournament to fields
Disabled the .node-tournament columns code
Disabled the .node-tournament columns code
Altered headings' top and bottom margin
Moved layout to a separate module dir
RubyMine project settings: disabled inspections
Sidebar!
A bloated bunch of changes. :(
derp compiles now
Update docs/HasManyExample.md

Corrected HasMany Example
spanish translation
Merge pull request #11 from dospuntocero/master

spanish translation.
Syntax highlighting for github
Syntax highlighting for github
Added notice about the directory name not being correct
Added catch to ensure the sort column is an Int or a subclass of the data type Int (fixes #12)
Corrected formatting
Merge branch 'master' of https://github.com/UndefinedOffset/SortableGridField

Conflicts:
	_config.php
round trip from java
removed handheld stylesheet
not sure
Altered ipsum
Revert "Altered ipsum"

This reverts commit 146d78ba671c6e5215adaa1591d77b292258686a.
Removed unnecessary blog glyph
Merge pull request #2 from lukehefson/Awesome-Ideas

Awesome ideas
fixed None value for status_values
renaming variables for better readability
First attempt at upgrading to 4.8.1.7... not yet able to run due to missing MFC DLL, watch this space...
began red-green unit tests for about, help, and main static pages
padding to make things pretty
Changed Add Control

had an issue...so I fixed it ;)
[svc-sass] - adding in the portal specific layout.scss file
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.
Added NodeImpl stress test to ensure that FindNodes always executes callback.
Changed from TCP to RUDP.
Bugfix - avoid accessing NULL DataStore in MockNodeImplTest.
Removed NodeImpl FindNodes stress test.
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.
fixed fiber db resharding
tiny refactor
test after reshard
Changed libpd submodule to own version
Update submodule to own version of libpd
Add project list to dashboard; pull out slideshow into shared partial; create separate new project form page
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/repo/index.html.haml
stuff
Updated to use correct json-cpp qmake file
Fix for raft being at nearest point
Do not separate support and model in pather, do both simultaneously
Add presentation day and language (sorry to forget them)
add public flag for compass heading calibration callback
renamed TasksManager to TasksContext
drugi wrzut
Makefile: Remove useless && in the clean target

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Makefile: Change location of -o flag

Usually, the -o flag is used in the target, and not in the CFLAGS.

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Reestruture Makefile and use .PHONY target

With this new structure, we can call the bin target aftet clean, because
we told to makefile that bin depends of build.

Suggested-by: Maarten ter Hurne <maarten@treewalker.org>
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Chat client first steps
Merge branch 'master' of github.com:marekventur/YouChoose
Story #138 (Renu/Yue) Test to save the Bill details
Story #134 (Raphael/Mengqiu) changed the names of the fields in the functional tests of CreateAccountController.
Converter script for the annual NO2 reports
Annual NO2 reports as refined by the converter script
fixed column mapper
bug, use of mapman
updated remote and added some plugins
added my post order
[README.md] arrow and italics

Nicer.
added basic rank-K search
Pass dpi to GC for converting points to pixels
Merge pull request #1209 from dmcdougall/mac_lw

Pass linewidth to Mac context properly
Simplify the command search logic.

Replace aspx and apachectl command search logic with AC_PATH_PROGS.
create configure script by autoconf.
lexer: replace 'if ... or ... or' with 'if a in b'
Fixes <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12340>.

Allows using a Python shell from TRAMP buffers again.
added ReportedFailedException which causes a batch to fail without killing worker and reports the error to the UI
update changelog
0.8.2-wip15
fix getting RELEASE in to_maven script
basic bolts check for reportedfailedexception
add projection validation for stream methods
expose testing/test-tuple into java api
add assertion for stream
update changelog
add prepare method to IScheduler
update changelog
Merge remote-tracking branch 'xuming/proj-validation' into fields-validate
tweak non-existent field error message a bit
update changelog
fix deadlock bug due to variant of dining philosophers problem. spouts now use an overflow buffer to prevent blocking and guarantee that it can consume the incoming queue of acks and fails

the bug resulted from cyclic topology e.g. spout -> bolt -> acker -> spout and all buffers filling up. All tasks would be blocked on emitting.
update changelog
Add bolt capacities to UI based on execute latency and executed
update changelog
fix regression in DefaultScheduler where it wouldn't reassign squeezed topologies correctly
Revert "basic bolts check for reportedfailedexception"

This reverts commit e8d886485923b0f7a5101e55ded48103751f55a0.
fixed rendermessage bug in optionspersistjoined
added makefile for gcc4.7 on x86
fixed bugs in build scripts
removed redundant makefile section
makefile simplifications
whitespaces fixes. moved warning flags from makefile to pragmas
Adding python server.
made black holes visible in level editor
Animationswechsel
Upgrade pg gem and database.
I like it now
Hid the googlebooks class on the briefcit
updated HSV range further
Cordura Swatches: Remove Pink. Fix #29
Add the ability to process individual records
Add additional information to browse indexes
Do not store old browse values in memory to prevent reindex from hanging
Add additional configuration option for how to handle reindexing eContent that hasn't changed
Update reindexing to add new config option for how to deal with updating eContent
Use consistent versions of jquery and jqueryui
Remove old autocomplete code
Fix next/previous links for navigating within search results
Hide useless navigation.
Add TODO.
Update README.
Added ZK nodes test
change os http api